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

[jan Iversen]

 configure.ac |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

New commits:
commit 6534fa1c2af838162453bf83a874af53e4e1a567
Author: jan Iversen <jani at libreoffice.org>
Date:   Mon Sep 11 09:03:46 2017 +0200

    iOS, add flag for bitcode (64bit)
    
    flag for bitcode needed for compiling some of
    the xml stuff.
    
    Change-Id: I0b696279180916757a1996fcc689e69326d22ddb

diff --git a/configure.ac b/configure.ac
index 6828b0ec6e2c..edfc281ebfb0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2952,7 +2952,7 @@ if test $_os = iOS; then
         versionmin=-mios-simulator-version-min=9.3
         if test "$host_cpu" = "arm64"; then
             XCODE_ARCHS=x86_64
-            BITNESS_OVERRIDE=64
+            BITNESS=-fembed-bitcode
         else
             XCODE_ARCHS=i386
         fi
@@ -2961,7 +2961,7 @@ if test $_os = iOS; then
         versionmin=-miphoneos-version-min=9.3
         if test "$host_cpu" = "arm64"; then
             XCODE_ARCHS=arm64
-            BITNESS_OVERRIDE=64
+            BITNESS=-fembed-bitcode
         else
             XCODE_ARCHS=arm
         fi
@@ -2998,8 +2998,8 @@ if test $_os = iOS; then
     XCODE_CLANG_CXX_LIBRARY=libc++
     stdlib="-stdlib=$XCODE_CLANG_CXX_LIBRARY"
 
-    CC="`xcrun -find clang` -arch $XCODE_ARCHS -fvisibility=hidden -isysroot $sysroot $lto $versionmin"
-    CXX="`xcrun -find clang++` -arch $XCODE_ARCHS -fvisibility=hidden $stdlib -isysroot $sysroot $lto $versionmin"
+    CC="`xcrun -find clang` -arch $XCODE_ARCHS -fvisibility=hidden $BITNESS -isysroot $sysroot $lto $versionmin"
+    CXX="`xcrun -find clang++` -arch $XCODE_ARCHS -fvisibility=hidden $stdlib $BITNESS -isysroot $sysroot $lto $versionmin"
 
     INSTALL_NAME_TOOL=`xcrun -find install_name_tool`
     AR=`xcrun -find ar`