Move clang flag to brightray
This commit is contained in:
parent
b6af1cf93c
commit
b947cb5057
2 changed files with 1 additions and 34 deletions
33
common.gypi
33
common.gypi
|
@ -3,12 +3,6 @@
|
||||||
'vendor/brightray/brightray.gypi',
|
'vendor/brightray/brightray.gypi',
|
||||||
],
|
],
|
||||||
'variables': {
|
'variables': {
|
||||||
'clang': 0,
|
|
||||||
'conditions': [
|
|
||||||
['OS=="mac" or OS=="linux"', {
|
|
||||||
'clang': 1,
|
|
||||||
}],
|
|
||||||
],
|
|
||||||
# Required by breakpad.
|
# Required by breakpad.
|
||||||
'os_bsd': 0,
|
'os_bsd': 0,
|
||||||
# Reflects node's config.gypi.
|
# Reflects node's config.gypi.
|
||||||
|
@ -213,33 +207,6 @@
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
'conditions': [
|
'conditions': [
|
||||||
# Settings to compile with clang under OS X.
|
|
||||||
['clang==1', {
|
|
||||||
'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
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}], # clang==1
|
|
||||||
# The breakdpad on Windows assumes Debug_x64 and Release_x64 configurations.
|
# The breakdpad on Windows assumes Debug_x64 and Release_x64 configurations.
|
||||||
['OS=="win"', {
|
['OS=="win"', {
|
||||||
'target_defaults': {
|
'target_defaults': {
|
||||||
|
|
2
vendor/brightray
vendored
2
vendor/brightray
vendored
|
@ -1 +1 @@
|
||||||
Subproject commit 80c8211551c3fe6a51ff0abfe235bd889d06ffd6
|
Subproject commit bf71f9ca78227171054f7cc9ed1407d72aec02db
|
Loading…
Reference in a new issue