From 580797ec7352ccfb91340e3174602300bf5a9500 Mon Sep 17 00:00:00 2001 From: Alex Zolotarev Date: Sat, 1 Sep 2012 21:20:01 +0300 Subject: [PATCH] [ios] Use Clang only for simulator builds --- iphone/Maps/Maps.xcodeproj/project.pbxproj | 8 ++++++++ tools/autobuild/ios.sh | 2 +- tools/mkspecs/iphonedevice-clang/qmake.conf | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 61e527f1d4..c1bc5624eb 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -4415,6 +4415,7 @@ GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_UNROLL_LOOPS = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = ""; @@ -4469,6 +4470,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv7]" = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_UNINITIALIZED_AUTOS = NO; HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = ""; @@ -4526,6 +4528,7 @@ GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_UNROLL_LOOPS = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = ""; @@ -4627,6 +4630,7 @@ GCC_SYMBOLS_PRIVATE_EXTERN = YES; GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv7]" = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_UNINITIALIZED_AUTOS = NO; HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = ""; @@ -4684,6 +4688,7 @@ GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_UNROLL_LOOPS = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = ""; @@ -4741,6 +4746,7 @@ GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_UNROLL_LOOPS = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = ""; @@ -4796,6 +4802,7 @@ GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_UNROLL_LOOPS = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = ""; @@ -4852,6 +4859,7 @@ GCC_THUMB_SUPPORT = NO; "GCC_THUMB_SUPPORT[arch=armv7]" = YES; GCC_UNROLL_LOOPS = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_UNINITIALIZED_AUTOS = YES; HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = ""; diff --git a/tools/autobuild/ios.sh b/tools/autobuild/ios.sh index b16dcd870a..c06785b2e9 100644 --- a/tools/autobuild/ios.sh +++ b/tools/autobuild/ios.sh @@ -34,7 +34,7 @@ if [[ $CONFIGURATION == "simulator" ]]; then MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonesimulator-clang" else SHADOW_DIR="${SHADOW_DIR_BASE}-${CONFIGURATION}" - MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonedevice-clang" + MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonedevice-llvm" fi if [[ $# > 1 && "$2" == "clean" ]] ; then diff --git a/tools/mkspecs/iphonedevice-clang/qmake.conf b/tools/mkspecs/iphonedevice-clang/qmake.conf index ec19f02b2b..6c0da306fb 100644 --- a/tools/mkspecs/iphonedevice-clang/qmake.conf +++ b/tools/mkspecs/iphonedevice-clang/qmake.conf @@ -69,7 +69,7 @@ QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -O3 +QMAKE_CFLAGS_RELEASE += -O4 QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += QMAKE_CFLAGS_STATIC_LIB +=