Make the Clang and ASan GYP definitions available for iOS.
The intention is to allow to build iOS Chrome/tests with asan=1, which is only possible with a custom Clang at the moment. The resulting binaries can't be shipped to users, but can be used to debug memory corruptions. Review URL: https://codereview.chromium.org/11273012 git-svn-id: http://src.chromium.org/svn/trunk/src/build@164619 4ff67af0-8c30-449e-8e8b-ad334ec8d88c
This commit is contained in:
Родитель
0701976cd2
Коммит
9fba15da18
62
common.gypi
62
common.gypi
|
@ -3019,40 +3019,8 @@
|
||||||
['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'},
|
['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'},
|
||||||
{'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'}
|
{'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'}
|
||||||
],
|
],
|
||||||
],
|
# Note that the prebuilt Clang binaries should not be used for iOS
|
||||||
},
|
# development except for ASan builds.
|
||||||
'target_conditions': [
|
|
||||||
['_type!="static_library"', {
|
|
||||||
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']},
|
|
||||||
}],
|
|
||||||
['_mac_bundle', {
|
|
||||||
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
|
|
||||||
}],
|
|
||||||
], # target_conditions
|
|
||||||
}, # target_defaults
|
|
||||||
}], # OS=="mac" or OS=="ios"
|
|
||||||
['OS=="mac"', {
|
|
||||||
'target_defaults': {
|
|
||||||
'variables': {
|
|
||||||
# These should end with %, but there seems to be a bug with % in
|
|
||||||
# variables that are intended to be set to different values in
|
|
||||||
# different targets, like these.
|
|
||||||
'mac_pie': 1, # Most executables can be position-independent.
|
|
||||||
'mac_real_dsym': 0, # Fake .dSYMs are fine in most cases.
|
|
||||||
# Strip debugging symbols from the target.
|
|
||||||
'mac_strip': '<(mac_strip_release)',
|
|
||||||
},
|
|
||||||
'xcode_settings': {
|
|
||||||
'GCC_DYNAMIC_NO_PIC': 'NO', # No -mdynamic-no-pic
|
|
||||||
# (Equivalent to -fPIC)
|
|
||||||
# MACOSX_DEPLOYMENT_TARGET maps to -mmacosx-version-min
|
|
||||||
'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)',
|
|
||||||
# Keep pch files below xcodebuild/.
|
|
||||||
'SHARED_PRECOMPS_DIR': '$(CONFIGURATION_BUILD_DIR)/SharedPrecompiledHeaders',
|
|
||||||
'OTHER_CFLAGS': [
|
|
||||||
'-fno-strict-aliasing', # See http://crbug.com/32204
|
|
||||||
],
|
|
||||||
'conditions': [
|
|
||||||
['clang==1', {
|
['clang==1', {
|
||||||
'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
|
'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
|
||||||
'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
|
'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
|
||||||
|
@ -3141,6 +3109,32 @@
|
||||||
['_mac_bundle', {
|
['_mac_bundle', {
|
||||||
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
|
'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']},
|
||||||
}],
|
}],
|
||||||
|
], # target_conditions
|
||||||
|
}, # target_defaults
|
||||||
|
}], # OS=="mac" or OS=="ios"
|
||||||
|
['OS=="mac"', {
|
||||||
|
'target_defaults': {
|
||||||
|
'variables': {
|
||||||
|
# These should end with %, but there seems to be a bug with % in
|
||||||
|
# variables that are intended to be set to different values in
|
||||||
|
# different targets, like these.
|
||||||
|
'mac_pie': 1, # Most executables can be position-independent.
|
||||||
|
'mac_real_dsym': 0, # Fake .dSYMs are fine in most cases.
|
||||||
|
# Strip debugging symbols from the target.
|
||||||
|
'mac_strip': '<(mac_strip_release)',
|
||||||
|
},
|
||||||
|
'xcode_settings': {
|
||||||
|
'GCC_DYNAMIC_NO_PIC': 'NO', # No -mdynamic-no-pic
|
||||||
|
# (Equivalent to -fPIC)
|
||||||
|
# MACOSX_DEPLOYMENT_TARGET maps to -mmacosx-version-min
|
||||||
|
'MACOSX_DEPLOYMENT_TARGET': '<(mac_deployment_target)',
|
||||||
|
# Keep pch files below xcodebuild/.
|
||||||
|
'SHARED_PRECOMPS_DIR': '$(CONFIGURATION_BUILD_DIR)/SharedPrecompiledHeaders',
|
||||||
|
'OTHER_CFLAGS': [
|
||||||
|
'-fno-strict-aliasing', # See http://crbug.com/32204
|
||||||
|
],
|
||||||
|
},
|
||||||
|
'target_conditions': [
|
||||||
['_type=="executable"', {
|
['_type=="executable"', {
|
||||||
'postbuilds': [
|
'postbuilds': [
|
||||||
{
|
{
|
||||||
|
|
Загрузка…
Ссылка в новой задаче