Kaydet (Commit) a1711c71 authored tarafından Tor Lillqvist's avatar Tor Lillqvist

Construct and propagate the argument to xcodebuild's -sdk option

Change-Id: I810ea99f61c47da62f2489d5176f6fbb779134a9
üst 65f12c0e
...@@ -631,6 +631,7 @@ export WPG_LIBS=$(gb_SPACE)@WPG_LIBS@ ...@@ -631,6 +631,7 @@ export WPG_LIBS=$(gb_SPACE)@WPG_LIBS@
export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@ export WPS_CFLAGS=$(gb_SPACE)@WPS_CFLAGS@
export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@ export WPS_LIBS=$(gb_SPACE)@WPS_LIBS@
export XCODE_ARCHS=@XCODE_ARCHS@ export XCODE_ARCHS=@XCODE_ARCHS@
export XCODEBUILD_SDK=@XCODEBUILD_SDK@
export XINERAMA_LINK=@XINERAMA_LINK@ export XINERAMA_LINK=@XINERAMA_LINK@
export XMLLINT=@XMLLINT@ export XMLLINT=@XMLLINT@
export XRANDR_CFLAGS=$(gb_SPACE)@XRANDR_CFLAGS@ export XRANDR_CFLAGS=$(gb_SPACE)@XRANDR_CFLAGS@
......
...@@ -3163,6 +3163,8 @@ if test $_os = iOS; then ...@@ -3163,6 +3163,8 @@ if test $_os = iOS; then
AC_MSG_RESULT($sysroot) AC_MSG_RESULT($sysroot)
XCODEBUILD_SDK=`echo $platform | tr A-Z a-z`$ios_sdk
if test "$enable_ios_simulator" = yes; then if test "$enable_ios_simulator" = yes; then
if test "$BITNESS_OVERRIDE" = 64; then if test "$BITNESS_OVERRIDE" = 64; then
XCODE_ARCHS=x86_64 XCODE_ARCHS=x86_64
...@@ -3225,6 +3227,7 @@ fi ...@@ -3225,6 +3227,7 @@ fi
AC_SUBST(XCODE_CLANG_CXX_LIBRARY) AC_SUBST(XCODE_CLANG_CXX_LIBRARY)
AC_SUBST(XCODE_ARCHS) AC_SUBST(XCODE_ARCHS)
AC_SUBST(XCODEBUILD_SDK)
AC_MSG_CHECKING([whether to treat the installation as read-only]) AC_MSG_CHECKING([whether to treat the installation as read-only])
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment