Brendan Shanks : makefiles: On macOS, use @rpath instead of @loader_path when building Unix libs.

[Alexandre Julliard]

Module: wine
Branch: stable
Commit: 7ae43d703d83f246a86cb403779dd96a40649c57
URL:    https://gitlab.winehq.org/wine/wine/-/commit/7ae43d703d83f246a86cb403779dd96...

Author: Brendan Shanks <bshanks(a)codeweavers.com>
Date:   Mon Mar  7 12:59:02 2022 -0800

makefiles: On macOS, use @rpath instead of @loader_path when building Unix libs.

Fixes launching 32-bit EXEs from a WOW64 build dir.

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=52618
Signed-off-by: Brendan Shanks <bshanks(a)codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard(a)winehq.org>
(cherry picked from commit 7b27e60e67d966a6db99dd2611310bc6e02a8e77)
Signed-off-by: Michael Stefaniuc <mstefani(a)winehq.org>

---

 configure               | 2 +-
 configure.ac            | 2 +-
 tools/winegcc/winegcc.c | 3 ++-
 3 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index dcce2e8644e..82870da724d 100755
--- a/configure
+++ b/configure
@@ -10380,7 +10380,7 @@ fi
         LIBS="$ac_save_LIBS"
     fi
 
-    UNIXLDFLAGS="-dynamiclib -install_name @loader_path/\$(UNIXLIB)"
+    UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/"
     LIBWINE_SHAREDLIB="libwine.$libwine_version.dylib"
 
     LIBWINE_LDFLAGS="-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"
diff --git a/configure.ac b/configure.ac
index b42cb8a5346..b9903b04671 100644
--- a/configure.ac
+++ b/configure.ac
@@ -781,7 +781,7 @@ case $host_os in
         LIBS="$ac_save_LIBS"
     fi
 
-    UNIXLDFLAGS="-dynamiclib -install_name @loader_path/\$(UNIXLIB)"
+    UNIXLDFLAGS="-dynamiclib -install_name @rpath/\$(UNIXLIB) -Wl,-rpath,@loader_path\/"
     AC_SUBST(LIBWINE_SHAREDLIB,"libwine.$libwine_version.dylib")
     AC_SUBST(LIBWINE_LDFLAGS,["-dynamiclib -install_name @rpath/libwine.$libwine_soversion.dylib -Wl,-rpath,@loader_path/ -compatibility_version $libwine_soversion -current_version $libwine_version"])
     AC_SUBST(WINELOADER_DEPENDS,"wine_info.plist")
diff --git a/tools/winegcc/winegcc.c b/tools/winegcc/winegcc.c
index 8644afe7535..5e666c395e5 100644
--- a/tools/winegcc/winegcc.c
+++ b/tools/winegcc/winegcc.c
@@ -415,7 +415,8 @@ static struct strarray get_link_args( struct options *opts, const char *output_n
         if (opts->unix_lib)
         {
             strarray_add( &flags, "-install_name" );
-            strarray_add( &flags, strmake( "@loader_path/%s.so", output_name ) );
+            strarray_add( &flags, strmake( "@rpath/%s.so", output_name ) );
+            strarray_add( &flags, "-Wl,-rpath,@loader_path/" );
         }
         strarray_addall( &link_args, flags );
         return link_args;