[PATCH] configure: Simplify flag checks for Mac preloader.
Brendan Shanks
bshanks at codeweavers.com
Wed Oct 27 15:13:10 CDT 2021
Always build the Mac preloader with '-mmacosx-version-min=10.7', which
works with all supported toolchains.
Fixes bug when building with Xcode 9 where preloader flags would be added
to EXTRACFLAGS and cause build failures on 32-bit.
Signed-off-by: Brendan Shanks <bshanks at codeweavers.com>
---
configure.ac | 14 ++++++--------
1 file changed, 6 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index b8356679e63..ef0d09e974d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -739,14 +739,12 @@ case $host_os in
WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -Wl,-image_base,0x7d400000,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist,-segaddr,WINE_4GB_RESERVE,0x100000000"
WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main],
[WINEPRELOADER_LDFLAGS="-Wl,-no_new_main $WINEPRELOADER_LDFLAGS"
- WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -nostartfiles -nodefaultlibs],,
- [WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs],
- [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"],
- [wine_can_build_preloader=no])])],
- [WINE_TRY_CFLAGS([-nostartfiles -nodefaultlibs],,
- [WINE_TRY_CFLAGS([-mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs],
- [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"],
- [wine_can_build_preloader=no])])])
+ WINE_TRY_CFLAGS([-Wl,-no_new_main -e _main -mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs],
+ [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"],
+ [wine_can_build_preloader=no])],
+ [WINE_TRY_CFLAGS([-mmacosx-version-min=10.7 -nostartfiles -nodefaultlibs],
+ [WINEPRELOADER_LDFLAGS="-mmacosx-version-min=10.7 $WINEPRELOADER_LDFLAGS"],
+ [wine_can_build_preloader=no])])
if test "$wine_can_build_preloader" = "yes"
then
WINE_TRY_CFLAGS([-Wl,-no_pie],
--
2.30.1 (Apple Git-130)
More information about the wine-devel
mailing list