diff options
| author | Alex Zolotarev <deathbaba@gmail.com> | 2012-08-15 14:46:39 +0400 |
|---|---|---|
| committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:41:55 +0300 |
| commit | 7388c3681873fc8f6f1c1e1ae5208ab4b58e7fea (patch) | |
| tree | 245c921a79e6c7883c4cba175244d0fede7029e2 | |
| parent | 4b95c20f44509c5a14fb50de1575679bde280ef9 (diff) | |
[ios] Switched default compiler from llvm-gcc to clang
| -rw-r--r-- | iphone/Maps/Maps.xcodeproj/project.pbxproj | 16 | ||||
| -rw-r--r-- | tools/autobuild/ios.sh | 2 |
2 files changed, 11 insertions, 7 deletions
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 2195111627..697f9c86be 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -4359,6 +4359,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 2.2; + DEAD_CODE_STRIPPING = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -4402,6 +4403,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 2.2; + DEAD_CODE_STRIPPING = NO; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -4419,7 +4421,6 @@ 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 = ""; @@ -4459,6 +4460,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 2.2; + DEAD_CODE_STRIPPING = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -4512,6 +4514,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 2.2; + DEAD_CODE_STRIPPING = NO; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -4529,7 +4532,6 @@ 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 = ""; @@ -4565,6 +4567,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 2.2; + DEAD_CODE_STRIPPING = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -4615,6 +4618,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 2.2; + DEAD_CODE_STRIPPING = NO; GCC_DYNAMIC_NO_PIC = NO; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -4668,6 +4672,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 2.2; + DEAD_CODE_STRIPPING = NO; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -4685,7 +4690,6 @@ 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 = ""; @@ -4725,6 +4729,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = YES; CURRENT_PROJECT_VERSION = 2.2; + DEAD_CODE_STRIPPING = NO; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -4742,7 +4747,6 @@ 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 = ""; @@ -4782,6 +4786,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 2.2; + DEAD_CODE_STRIPPING = NO; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -4798,7 +4803,6 @@ 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 = ""; @@ -4838,6 +4842,7 @@ COMPRESS_PNG_FILES = NO; COPY_PHASE_STRIP = NO; CURRENT_PROJECT_VERSION = 2.2; + DEAD_CODE_STRIPPING = NO; GCC_DYNAMIC_NO_PIC = YES; GCC_ENABLE_PASCAL_STRINGS = NO; GCC_FAST_MATH = YES; @@ -4854,7 +4859,6 @@ 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 68eba54280..24332db64e 100644 --- a/tools/autobuild/ios.sh +++ b/tools/autobuild/ios.sh @@ -35,7 +35,7 @@ if [[ $CONFIGURATION == "simulator" ]]; then MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonesimulator-clang" else SHADOW_DIR="${SHADOW_DIR_BASE}-${CONFIGURATION}" - MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonedevice-llvm" + MKSPEC="$LOCAL_DIRNAME/../mkspecs/iphonedevice-clang" fi if [[ $# > 1 && "$2" == "clean" ]] ; then |