[Libreoffice-commits] core.git: 3 commits - config_host.mk.in configure.ac ios/CustomTarget_TiledLibreOffice_app.mk ios/lo.xcconfig.in

[Tor Lillqvist]

 config_host.mk.in                        |    1 +
 configure.ac                             |    3 +++
 ios/CustomTarget_TiledLibreOffice_app.mk |    1 +
 ios/lo.xcconfig.in                       |    1 +
 4 files changed, 6 insertions(+)

New commits:
commit 493a058dea0119e3eff0fe61f796885a7496df7c
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jul 8 18:02:30 2014 +0300

    Set VALID_ARCHS equal to ARCHS
    
    Change-Id: Ief7d3b09cb68eb2abdb99ebc9cfac7f71cd1476e

diff --git a/ios/lo.xcconfig.in b/ios/lo.xcconfig.in
index 60e228e..21fdc15 100644
--- a/ios/lo.xcconfig.in
+++ b/ios/lo.xcconfig.in
@@ -21,6 +21,7 @@ LO_WORKDIR = @WORKDIR@
 // variables are prefixed with XCODE_ to make it clear in configure.ac
 // what they will be used for.
 ARCHS = @XCODE_ARCHS@
+VALID_ARCHS = @XCODE_ARCHS@
 CLANG_CXX_LIBRARY = @XCODE_CLANG_CXX_LIBRARY@
 DEBUG_INFORMATION_FORMAT=@XCODE_DEBUG_INFORMATION_FORMAT@
 
commit a0368175867a53c858133732454c9797ebd29ffc
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jul 8 18:01:35 2014 +0300

    Pass -sdk option
    
    Change-Id: I694d90e2cfca2b4b68a33df0d3912c2492563d28

diff --git a/ios/CustomTarget_TiledLibreOffice_app.mk b/ios/CustomTarget_TiledLibreOffice_app.mk
index 73f9fcc..aa89470 100644
--- a/ios/CustomTarget_TiledLibreOffice_app.mk
+++ b/ios/CustomTarget_TiledLibreOffice_app.mk
@@ -19,6 +19,7 @@ define TiledLibreOfficeXcodeBuild
 		xcodebuild \
 			-project experimental/TiledLibreOffice/TiledLibreOffice.xcodeproj \
 			-target TiledLibreOffice \
+			-sdk $(XCODEBUILD_SDK) \
 			-arch $(XCODE_ARCHS) \
 			-configuration $(if $(ENABLE_DEBUG),Debug,Release) \
 			$(1) \
commit a1711c717e0b5b7b2b5b722aba34cf32aa6c87aa
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Jul 8 17:59:59 2014 +0300

    Construct and propagate the argument to xcodebuild's -sdk option
    
    Change-Id: I810ea99f61c47da62f2489d5176f6fbb779134a9

diff --git a/config_host.mk.in b/config_host.mk.in
index 382a407..872172e 100644
--- a/config_host.mk.in
+++ b/config_host.mk.in
@@ -631,6 +631,7 @@ export WPG_LIBS=$(gb_SPACE)@WPG_LIBS@
 export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@
 export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@
 export XCODE_ARCHS=@XCODE_ARCHS@
+export XCODEBUILD_SDK=@XCODEBUILD_SDK@
 export XINERAMA_LINK=@XINERAMA_LINK@
 export XMLLINT=@XMLLINT@
 export XRANDR_CFLAGS=$(gb_SPACE)@XRANDR_CFLAGS@
diff --git a/configure.ac b/configure.ac
index 12e45dd..efe0bf4 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3163,6 +3163,8 @@ if test $_os = iOS; then
 
     AC_MSG_RESULT($sysroot)
 
+    XCODEBUILD_SDK=`echo $platform | tr A-Z a-z`$ios_sdk
+
     if test "$enable_ios_simulator" = yes; then
         if test "$BITNESS_OVERRIDE" = 64; then
             XCODE_ARCHS=x86_64
@@ -3225,6 +3227,7 @@ fi
 
 AC_SUBST(XCODE_CLANG_CXX_LIBRARY)
 AC_SUBST(XCODE_ARCHS)
+AC_SUBST(XCODEBUILD_SDK)
 
 AC_MSG_CHECKING([whether to treat the installation as read-only])