ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

configure: Fix problem with linking on OS X 10.7. 

Some of the new link commands in the latest ld appear to be buggy and cause
bus error while initializing libSystem. Fixed by reverting to 10.6 linking
behavior.
This commit is contained in:
Camillo Lugaresi 2011-08-02 04:31:53 +02:00 committed by Alexandre Julliard
parent 23c8704cb5
commit 0b5dcbafea
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
configure vendored
View File

@ -6417,8 +6417,14 @@ fi
APPLICATIONSERVICESLIB="-framework ApplicationServices" APPLICATIONSERVICESLIB="-framework ApplicationServices"
LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000" case $host_os in
darwin11*)
LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"
;;
*)
LDEXECFLAGS="-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"
;;
esac
if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
then then
DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation" DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation"

7
configure.ac
View File

@ -697,7 +697,12 @@ case $host_os in
AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation") AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation") AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices") AC_SUBST(APPLICATIONSERVICESLIB,"-framework ApplicationServices")
AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) case $host_os in
darwin11*)
AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-macosx_version_min,10.6,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) ;;
*)
AC_SUBST(LDEXECFLAGS,["-image_base 0x7bf00000 -Wl,-segaddr,WINE_DOS,0x00001000,-segaddr,WINE_SHAREDHEAP,0x7f000000"]) ;;
esac
if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes" if test "$ac_cv_header_DiskArbitration_DiskArbitration_h" = "yes"
then then
dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found