system/wine
system/wine
1
0
Fork 0
mirror of git://source.winehq.org/git/wine.git synced 2024-09-30 04:38:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

configure: Rename wine_can_build_preloader to wine_use_preloader, and also use it for Linux.

Browse source
This commit is contained in:
Brendan Shanks 2024-04-04 11:49:06 -07:00 committed by Alexandre Julliard
parent 9669cd56f4
commit 266e95a21b
2 changed files with 20 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
configure vendored
View file

@ -9534,11 +9534,11 @@ fi
WINELOADER_LDFLAGS="-Wl,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
case $HOST_ARCH in
i386|x86_64) wine_can_build_preloader=yes ;;
*) wine_can_build_preloader=no ;;
i386|x86_64) wine_use_preloader=yes ;;
*) wine_use_preloader=no ;;
esac
if test "$wine_can_build_preloader" = "yes"
if test "$wine_use_preloader" = "yes"
then
WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -mmacosx-version-min=10.7 -Wl,-no_new_main,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking whether the compiler supports -Wl,-no_pie" >&5
@ -20448,19 +20448,17 @@ case $host_os in
linux*)
if test $HOST_ARCH != unknown
then
test "$wine_binary" = wine || as_fn_append CONFIGURE_TARGETS " loader/wine-preloader"
WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
fi
;;
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"
wine_use_preloader=yes
fi
;;
esac
if test "$wine_use_preloader" = "yes"
then
test "$wine_binary" = wine || as_fn_append CONFIGURE_TARGETS " loader/wine-preloader"
WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
fi
{ printf "%s\n" "$as_me:${as_lineno-$LINENO}: checking for library containing dlopen" >&5
printf %s "checking for library containing dlopen... " >&6; }

22
configure.ac
View file

@ -640,11 +640,11 @@ case $host_os in
WINELOADER_LDFLAGS="-Wl,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
case $HOST_ARCH in
i386|x86_64) wine_can_build_preloader=yes ;;
*) wine_can_build_preloader=no ;;
i386|x86_64) wine_use_preloader=yes ;;
*) wine_use_preloader=no ;;
esac
if test "$wine_can_build_preloader" = "yes"
if test "$wine_use_preloader" = "yes"
then
WINEPRELOADER_LDFLAGS="-nostartfiles -nodefaultlibs -e _start -ldylib1.o -mmacosx-version-min=10.7 -Wl,-no_new_main,-segalign,0x1000,-pagezero_size,0x1000,-sectcreate,__TEXT,__info_plist,loader/wine_info.plist"
WINE_TRY_CFLAGS([-Wl,-no_pie],
@ -2033,19 +2033,17 @@ case $host_os in
linux*)
if test $HOST_ARCH != unknown
then
test "$wine_binary" = wine || WINE_IGNORE_FILE(loader/wine-preloader)
WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
fi
;;
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"
wine_use_preloader=yes
fi
;;
esac
if test "$wine_use_preloader" = "yes"
then
test "$wine_binary" = wine || WINE_IGNORE_FILE(loader/wine-preloader)
WINELOADER_PROGRAMS="$WINELOADER_PROGRAMS $wine_binary-preloader"
fi
dnl **** Check for functions ****
dnl Check for -ldl