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

Tor Lillqvist tml at collabora.com
Wed Oct 1 23:44:37 PDT 2014


 configure.ac |   28 ++++++++++++----------------
 1 file changed, 12 insertions(+), 16 deletions(-)

New commits:
commit c22c4b5be228e7b17cc1d84db4a945f93a175312
Author: Tor Lillqvist <tml at collabora.com>
Date:   Thu Oct 2 09:39:21 2014 +0300

    No need for a case statement here
    
    Change-Id: I9656cf20d034d8b33bee117c809713923179f26b

diff --git a/configure.ac b/configure.ac
index f4f6ceb..569a73f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2787,22 +2787,18 @@ if test $_os = Darwin; then
     INSTALL_NAME_TOOL=install_name_tool
     if test -z "$save_CC"; then
         AC_MSG_CHECKING([what compiler to use])
-        case $with_macosx_sdk in
-        10.8|10.9|10.10)
-            stdlib=-stdlib=libc++
-            if test "$ENABLE_LTO" = TRUE; then
-                lto=-flto
-            fi
-            CC="`xcrun -find clang` -m64 $lto -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
-            CXX="`xcrun -find clang++` -m64 $lto $stdlib -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
-            INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
-            AR=`xcrun -find ar`
-            NM=`xcrun -find nm`
-            STRIP=`xcrun -find strip`
-            LIBTOOL=`xcrun -find libtool`
-            RANLIB=`xcrun -find ranlib`
-            ;;
-        esac
+        stdlib=-stdlib=libc++
+        if test "$ENABLE_LTO" = TRUE; then
+            lto=-flto
+        fi
+        CC="`xcrun -find clang` -m64 $lto -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+        CXX="`xcrun -find clang++` -m64 $lto $stdlib -mmacosx-version-min=$with_macosx_version_min_required -isysroot $MACOSX_SDK_PATH"
+        INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
+        AR=`xcrun -find ar`
+        NM=`xcrun -find nm`
+        STRIP=`xcrun -find strip`
+        LIBTOOL=`xcrun -find libtool`
+        RANLIB=`xcrun -find ranlib`
         AC_MSG_RESULT([$CC and $CXX])
     fi
 


More information about the Libreoffice-commits mailing list