mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add flag to disable clang under Linux.

Browse source
This commit is contained in:
Cheng Zhao 2013-12-31 11:09:24 +00:00
parent 37679214d1
commit 13f816b4bb
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
brightray/brightray.gyp
View file

@ -88,7 +88,7 @@
], ],
'conditions': [ 'conditions': [
['OS=="linux"', { ['OS=="linux"', {
'cflags': [ 'cflags_cc': [
'-fno-rtti', '-fno-rtti',
], ],
'link_settings': { 'link_settings': {

11
brightray/brightray.gypi
View file

@ -8,6 +8,9 @@
'mac_deployment_target%': '10.8', 'mac_deployment_target%': '10.8',
'mac_sdkroot%': 'macosx', 'mac_sdkroot%': 'macosx',
# Build with clang under Linux.
'linux_clang%': 1,
'win_release_RuntimeLibrary%': '2', # /MD (nondebug DLL) 'win_release_RuntimeLibrary%': '2', # /MD (nondebug DLL)
'win_debug_RuntimeLibrary%': '3', # /MTd (debug DLL) 'win_debug_RuntimeLibrary%': '3', # /MTd (debug DLL)
@ -176,7 +179,6 @@
}], }],
['OS=="linux"', { ['OS=="linux"', {
'cflags_cc': [ 'cflags_cc': [
'-std=gnu++11',
'-fno-rtti', '-fno-rtti',
'<!@(pkg-config --cflags gtk+-2.0)', '<!@(pkg-config --cflags gtk+-2.0)',
], ],
@ -189,7 +191,7 @@
], ],
}, },
'conditions': [ 'conditions': [
['OS=="linux"', { ['OS=="linux" and linux_clang==1', {
'make_global_settings': [ 'make_global_settings': [
['CC', '/usr/bin/clang'], ['CC', '/usr/bin/clang'],
['CXX', '/usr/bin/clang++'], ['CXX', '/usr/bin/clang++'],
@ -198,6 +200,11 @@
['CXX.host', '$(CXX)'], ['CXX.host', '$(CXX)'],
['LINK.host', '$(LINK)'], ['LINK.host', '$(LINK)'],
], ],
'target_defaults': {
'cflags_cc': [
'-std=gnu++11',
],
},
}], }],
['OS=="win"', { ['OS=="win"', {
'target_defaults': { 'target_defaults': {