Alexandre Julliard : configure: Don't rename the loader to wine64 for multi-arch builds.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 5884e98fbec966b0ad9f3babcbec7d8fe25dbc1d
URL:    https://gitlab.winehq.org/wine/wine/-/commit/5884e98fbec966b0ad9f3babcbec7d8...

Author: Alexandre Julliard <julliard(a)winehq.org>
Date:   Tue Nov 22 14:28:05 2022 +0100

configure: Don't rename the loader to wine64 for multi-arch builds.

---

 configure    | 25 +++++++++++++++++--------
 configure.ac | 19 ++++++++++++++-----
 2 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/configure b/configure
index e17b71555f2..66519182d59 100755
--- a/configure
+++ b/configure
@@ -653,6 +653,7 @@ ac_subst_vars='LTLIBOBJS
 LIBOBJS
 TAGSFLAGS
 RT_LIBS
+WINELOADER_PROGRAMS
 DELAYLOADFLAG
 MSVCRTFLAGS
 NETAPI_LIBS
@@ -755,7 +756,6 @@ COREFOUNDATION_LIBS
 ac_ct_OBJC
 OBJCFLAGS
 OBJC
-WINELOADER_PROGRAMS
 CONFIGURE_TARGETS
 DISABLED_SUBDIRS
 SUBDIRS
@@ -9471,10 +9471,6 @@ $ac_links:
     for f in $ac_links; do as_fn_append CONFIGURE_TARGETS " $f"; done
 }
 
-wine_binary="wine"
-test "$HOST_ARCH" != x86_64 || wine_binary="wine64"
-WINELOADER_PROGRAMS="$wine_binary"
-
 libwine_soversion=`expr $libwine_version : '\([0-9]*\)\..*'`
 
 case $host_os in
@@ -9946,8 +9942,6 @@ if test "x$ac_cv_cflags__Wl__no_pie" = xyes
 then :
   WINEPRELOADER_LDFLAGS="-Wl,-no_pie $WINEPRELOADER_LDFLAGS"
 fi
-        test "$wine_binary" = wine || as_fn_append CONFIGURE_TARGETS " loader/wine-preloader"
-        WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
                 WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -mmacosx-version-min=10.7"
     else
         as_fn_append wine_warnings "|can't build Wine preloader; many programs won't work"
@@ -19600,6 +19594,14 @@ then
 fi
 
 
+case "$HOST_ARCH,$PE_ARCHS" in
+  x86_64,*i386*) wine_binary="wine" ;;
+  x86_64,*) wine_binary="wine64" ;;
+  *) wine_binary="wine" ;;
+esac
+WINELOADER_PROGRAMS="$wine_binary"
+
+
 case $host_os in
   linux*)
     case $host_cpu in
@@ -19609,6 +19611,13 @@ case $host_os in
         ;;
     esac
     ;;
+  darwin*|macosx*)
+    if test "$wine_can_build_preloader" = "yes"
+    then
+        test "$wine_binary" = wine || as_fn_append CONFIGURE_TARGETS " loader/wine-preloader"
+        WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
+    fi
+    ;;
 esac
 
 
@@ -23151,7 +23160,6 @@ READELF = $READELF
 SUBDIRS = $SUBDIRS
 DISABLED_SUBDIRS = $DISABLED_SUBDIRS
 CONFIGURE_TARGETS = $CONFIGURE_TARGETS
-WINELOADER_PROGRAMS = $WINELOADER_PROGRAMS
 OBJC = $OBJC
 OBJCFLAGS = $OBJCFLAGS
 ac_ct_OBJC = $ac_ct_OBJC
@@ -23254,6 +23262,7 @@ NETAPI_CFLAGS = $NETAPI_CFLAGS
 NETAPI_LIBS = $NETAPI_LIBS
 MSVCRTFLAGS = $MSVCRTFLAGS
 DELAYLOADFLAG = $DELAYLOADFLAG
+WINELOADER_PROGRAMS = $WINELOADER_PROGRAMS
 RT_LIBS = $RT_LIBS
 TAGSFLAGS = $TAGSFLAGS
 LIBOBJS = $LIBOBJS
diff --git a/configure.ac b/configure.ac
index b7d443c1182..32eb88129eb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -656,9 +656,6 @@ LIBEXT="so"
 WINE_PATH_SONAME_TOOLS
 WINE_CONFIG_HELPERS
 
-wine_binary="wine"
-test "$HOST_ARCH" != x86_64 || wine_binary="wine64"
-AC_SUBST(WINELOADER_PROGRAMS,"$wine_binary")
 libwine_soversion=`expr $libwine_version : '\([[0-9]]*\)\..*'`
 
 case $host_os in
@@ -709,8 +706,6 @@ case $host_os in
     then
         WINE_TRY_CFLAGS([-Wl,-no_pie],
                         [WINEPRELOADER_LDFLAGS="-Wl,-no_pie $WINEPRELOADER_LDFLAGS"])
-        test "$wine_binary" = wine || WINE_IGNORE_FILE(loader/wine-preloader)
-        WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
         dnl If preloader is used, the loader needs to be an LC_UNIXTHREAD binary to avoid AppKit/Core Animation problems.
         WINELOADER_LDFLAGS="$WINELOADER_LDFLAGS -mmacosx-version-min=10.7"
     else
@@ -2015,6 +2010,13 @@ fi
 
 dnl **** Platform-specific checks ****
 
+case "$HOST_ARCH,$PE_ARCHS" in
+  x86_64,*i386*) wine_binary="wine" ;;
+  x86_64,*) wine_binary="wine64" ;;
+  *) wine_binary="wine" ;;
+esac
+AC_SUBST(WINELOADER_PROGRAMS,"$wine_binary")
+
 case $host_os in
   linux*)
     case $host_cpu in
@@ -2024,6 +2026,13 @@ case $host_os in
         ;;
     esac
     ;;
+  darwin*|macosx*)
+    if test "$wine_can_build_preloader" = "yes"
+    then
+        test "$wine_binary" = wine || WINE_IGNORE_FILE(loader/wine-preloader)
+        WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
+    fi
+    ;;
 esac
 
 dnl **** Check for functions ****