diff options
| author | Ilya Grechuhin <i.grechuhin@gmail.com> | 2017-09-21 14:16:14 +0300 |
|---|---|---|
| committer | Vladimir Byko-Ianko <bykoianko@gmail.com> | 2017-09-27 19:04:41 +0300 |
| commit | 128d06595bf3959f0e80735d16eb771cad3f2062 (patch) | |
| tree | ed2832f42466579351e69e9ded090b6bb68a1d57 | |
| parent | e9785a011c3f0c96f7b249a5b1e09c401bed6e79 (diff) | |
[xcode-9] [ios] Fixed qmake build.
| -rw-r--r-- | iphone/Maps/run-script-for-target.sh | 2 | ||||
| -rw-r--r-- | tools/mkspecs/iphonedevice-clang/qmake.conf | 7 |
2 files changed, 2 insertions, 7 deletions
diff --git a/iphone/Maps/run-script-for-target.sh b/iphone/Maps/run-script-for-target.sh index 53e73079b9..26584fb5f3 100644 --- a/iphone/Maps/run-script-for-target.sh +++ b/iphone/Maps/run-script-for-target.sh @@ -25,7 +25,7 @@ fi # Respect "Build for active arch only" project setting. if [[ "$ONLY_ACTIVE_ARCH" == YES ]]; then if [[ ! -z $CURRENT_ARCH ]]; then - VALID_ARCHS="$CURRENT_ARCH" + VALID_ARCHS=${ARCHS[0]} fi fi diff --git a/tools/mkspecs/iphonedevice-clang/qmake.conf b/tools/mkspecs/iphonedevice-clang/qmake.conf index b7026a431e..dd0a98258c 100644 --- a/tools/mkspecs/iphonedevice-clang/qmake.conf +++ b/tools/mkspecs/iphonedevice-clang/qmake.conf @@ -62,12 +62,7 @@ QMAKE_EXTENSION_STATICLIB = a QMAKE_COMPILER_DEFINES += __GNUC__ DEFINES += __IPHONE_OS_VERSION_MIN_REQUIRED=70000 -#QMAKE_CFLAGS += -isysroot $$IPHONE_SDK_PATH -#QMAKE_CFLAGS += -I$$IPHONE_SDK_PATH/usr/include -QMAKE_CFLAGS += --sysroot=$$IPHONE_SDK_PATH -QMAKE_CFLAGS += -isystem $$IPHONE_SDK_PATH/usr/include -QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH -#QMAKE_CFLAGS += -iwithsysroot $$IPHONE_SDK_PATH/System/Library/Frameworks/ +QMAKE_CFLAGS += -isysroot $$IPHONE_SDK_PATH QMAKE_CFLAGS += -fmessage-length=0 QMAKE_CFLAGS += -pipe -miphoneos-version-min=8.0 -Wno-deprecated-register QMAKE_CFLAGS_DEPS += -M |