Camillo Lugaresi : configure: Fix problem with linking on OS X 10.7.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: 0b5dcbafea44bf68ec72494cc9f2c6f2dbb2cd16
URL:    http://source.winehq.org/git/wine.git/?a=commit;h=0b5dcbafea44bf68ec72494cc9...

Author: Camillo Lugaresi 
Date:   Tue Aug  2 04:31:53 2011 +0200

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.

---

configure    |   10 ++++++++--
 configure.ac |    7 ++++++-
 2 files changed, 14 insertions(+), 3 deletions(-)

diff --git a/configure b/configure
index 0fbfd51..3876127 100755
--- a/configure
+++ b/configure
@@ -6417,8 +6417,14 @@ fi

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"
     then
                 DISKARBITRATIONLIB="-framework DiskArbitration -framework CoreFoundation"
diff --git a/configure.ac b/configure.ac
index 8104f7f..ecd74d6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -697,7 +697,12 @@ case $host_os in
     AC_SUBST(COREFOUNDATIONLIB,"-framework CoreFoundation")
     AC_SUBST(IOKITLIB,"-framework IOKit -framework CoreFoundation")
     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"
     then
         dnl DiskArbitration API is not public on Darwin < 8.0, use it only if header found