Do not force using clang

This commit is contained in:
Cheng Zhao 2015-07-01 14:32:04 +08:00
parent de57d822d7
commit d440a3c21d

View file

@ -3,9 +3,6 @@
'vendor/download/libchromiumcontent/filenames.gypi', 'vendor/download/libchromiumcontent/filenames.gypi',
], ],
'variables': { 'variables': {
# Build with clang on Linux and Mac.
'clang%': 1,
'libchromiumcontent_src_dir': '<(libchromiumcontent_root_dir)/src', 'libchromiumcontent_src_dir': '<(libchromiumcontent_root_dir)/src',
'libchromiumcontent_component%': 1, 'libchromiumcontent_component%': 1,
'conditions': [ 'conditions': [
@ -326,41 +323,4 @@
}], }],
], # target_conditions ], # target_conditions
}, # target_defaults }, # target_defaults
'conditions': [
['clang', {
'make_global_settings': [
['CC', '/usr/bin/clang'],
['CXX', '/usr/bin/clang++'],
['LINK', '$(CXX)'],
['CC.host', '$(CC)'],
['CXX.host', '$(CXX)'],
['LINK.host', '$(LINK)'],
],
'target_defaults': {
'cflags_cc': [
'-std=c++11',
],
'xcode_settings': {
'CC': '/usr/bin/clang',
'LDPLUSPLUS': '/usr/bin/clang++',
'OTHER_CFLAGS': [
'-fcolor-diagnostics',
],
'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99
'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', # -std=c++11
},
'target_conditions': [
['_type in ["executable", "shared_library"]', {
'xcode_settings': {
# On some machines setting CLANG_CXX_LIBRARY doesn't work for
# linker.
'OTHER_LDFLAGS': [ '-stdlib=libc++' ],
},
}],
],
},
}], # clang
],
} }