[Libreoffice-commits] core.git: configure.ac

[Thorsten Behrens]

 configure.ac |   14 +++++++++-----
 1 file changed, 9 insertions(+), 5 deletions(-)

New commits:
commit 7885f9820d5d1ca80381bf88ea2be537874e5ad5
Author: Thorsten Behrens <tbehrens at suse.com>
Date:   Wed Apr 3 13:36:47 2013 +0200

    Make 10.6 sdk in XCode 4 setup work in configury.
    
    Change-Id: Ia7393d177a24ec6d5e3c25e487a8d5ae96e3c02a

diff --git a/configure.ac b/configure.ac
index f096cb3..cc24bf0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2558,11 +2558,15 @@ if test "$_os" = "Darwin"; then
             CXX="${gccprefix}g++-4.0 $arch -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
             ;;
         10.6)
-            # Is similar logic as above needed? Is it likely somebody
-            # has both an older Xcode with the 10.6 SDK and a current
-            # Xcode?
-            CC="gcc-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
-            CXX="g++-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+            # did someone copy her 10.6 sdk into xcode 4 (needed on Mountain Lion)?
+            if test "$(echo $MACOSX_SDK_PATH | cut -c1-23)" = "/Applications/Xcode.app"; then
+                CC="`xcrun -find gcc` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+                CXX="`xcrun -find g++` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+                XCRUN=xcrun
+            else
+                CC="gcc-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+                CXX="g++-4.2 $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+            fi
             ;;
         10.7|10.8)
             CC="`xcrun -find clang` $bitness -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"