diff options
author | Alex Zolotarev <deathbaba@gmail.com> | 2012-09-10 03:02:31 +0400 |
---|---|---|
committer | Alex Zolotarev <alex@maps.me> | 2015-09-23 01:43:08 +0300 |
commit | a623d1d0701347e57fe4689c4103df2725ff151b (patch) | |
tree | 9039677b172f797c18a6f48a9f52f39eccf6a2ad | |
parent | c0da987523f5d3e3b4fe688c09177e117e8fb110 (diff) |
[ios] llvm-gcc as a default compiler, disabled link-time optimization
-rw-r--r-- | iphone/Maps/Maps.xcodeproj/project.pbxproj | 32 | ||||
-rw-r--r-- | tools/mkspecs/iphonedevice-clang/qmake.conf | 2 | ||||
-rw-r--r-- | tools/mkspecs/iphonedevice-llvm/qmake.conf | 2 |
3 files changed, 4 insertions, 32 deletions
diff --git a/iphone/Maps/Maps.xcodeproj/project.pbxproj b/iphone/Maps/Maps.xcodeproj/project.pbxproj index 47418ad4db..5e441e5709 100644 --- a/iphone/Maps/Maps.xcodeproj/project.pbxproj +++ b/iphone/Maps/Maps.xcodeproj/project.pbxproj @@ -4353,8 +4353,6 @@ 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; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -4366,12 +4364,12 @@ _DEBUG, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_UNINITIALIZED_AUTOS = NO; HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphonesim-debug/out/debug\""; - LLVM_LTO = NO; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; @@ -4397,8 +4395,6 @@ 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; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -4421,7 +4417,6 @@ INFOPLIST_FILE = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\""; - LLVM_LTO = YES; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; @@ -4455,8 +4450,6 @@ 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; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -4476,7 +4469,6 @@ INFOPLIST_FILE = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-debug/out/debug\""; - LLVM_LTO = NO; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; @@ -4510,8 +4502,6 @@ 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; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -4534,7 +4524,6 @@ INFOPLIST_FILE = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\""; - LLVM_LTO = YES; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; @@ -4564,8 +4553,6 @@ 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; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -4577,12 +4564,12 @@ _DEBUG, ); GCC_SYMBOLS_PRIVATE_EXTERN = YES; + GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_WARN_UNINITIALIZED_AUTOS = NO; HEADER_SEARCH_PATHS = ../../3party/boost; INFOPLIST_FILE = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphonesim-debug/out/debug\""; - LLVM_LTO = NO; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; @@ -4615,8 +4602,6 @@ 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; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -4636,7 +4621,6 @@ INFOPLIST_FILE = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-debug/out/debug\""; - LLVM_LTO = NO; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; @@ -4670,8 +4654,6 @@ 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; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -4694,7 +4676,6 @@ INFOPLIST_FILE = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\""; - LLVM_LTO = YES; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; @@ -4728,8 +4709,6 @@ 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; GCC_GENERATE_DEBUGGING_SYMBOLS = NO; @@ -4752,7 +4731,6 @@ INFOPLIST_FILE = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-production/out/production\""; - LLVM_LTO = YES; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; @@ -4785,8 +4763,6 @@ 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; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -4808,7 +4784,6 @@ INFOPLIST_FILE = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-release/out/release\""; - LLVM_LTO = YES; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; @@ -4842,8 +4817,6 @@ 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; GCC_GENERATE_DEBUGGING_SYMBOLS = YES; @@ -4865,7 +4838,6 @@ INFOPLIST_FILE = ""; IPHONEOS_DEPLOYMENT_TARGET = 4.0; LIBRARY_SEARCH_PATHS = "\"$(SRCROOT)/../../../omim-iphone-release/out/release\""; - LLVM_LTO = YES; ONLY_ACTIVE_ARCH = NO; OTHER_CFLAGS = "-Wall"; OTHER_CPLUSPLUSFLAGS = "$(OTHER_CFLAGS)"; diff --git a/tools/mkspecs/iphonedevice-clang/qmake.conf b/tools/mkspecs/iphonedevice-clang/qmake.conf index 6c0da306fb..30095cbfeb 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 += -O4 +QMAKE_CFLAGS_RELEASE += -O3 -funroll-loops QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += QMAKE_CFLAGS_STATIC_LIB += diff --git a/tools/mkspecs/iphonedevice-llvm/qmake.conf b/tools/mkspecs/iphonedevice-llvm/qmake.conf index aa08cb26a5..02a2667554 100644 --- a/tools/mkspecs/iphonedevice-llvm/qmake.conf +++ b/tools/mkspecs/iphonedevice-llvm/qmake.conf @@ -69,7 +69,7 @@ QMAKE_CFLAGS += -pipe -miphoneos-version-min=4.0 -dead_strip QMAKE_CFLAGS_DEPS += -M QMAKE_CFLAGS_WARN_ON += -Wall -W QMAKE_CFLAGS_WARN_OFF += -w -QMAKE_CFLAGS_RELEASE += -O3 +QMAKE_CFLAGS_RELEASE += -O3 -funroll-loops QMAKE_CFLAGS_DEBUG += -g QMAKE_CFLAGS_SHLIB += QMAKE_CFLAGS_STATIC_LIB += |