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

Build with clang under Linux.

Browse source
This commit is contained in:
Cheng Zhao 2013-12-31 11:27:31 +00:00
parent 63852a8c82
commit c64a793364
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
common.gypi
View file

@ -2,7 +2,7 @@
'variables': { 'variables': {
'clang': 0, 'clang': 0,
'conditions': [ 'conditions': [
['OS=="mac"', { ['OS=="mac" or OS=="linux"', {
'clang': 1, 'clang': 1,
}], }],
['OS=="win" and (MSVS_VERSION=="2012e" or MSVS_VERSION=="2010e")', { ['OS=="win" and (MSVS_VERSION=="2012e" or MSVS_VERSION=="2010e")', {
@ -152,7 +152,9 @@
], ],
'target_defaults': { 'target_defaults': {
'cflags_cc': [ 'cflags_cc': [
'-std=c++11', # Use gnu++11 instead of c++11 here, see:
# https://code.google.com/p/chromium/issues/detail?id=224515
'-std=gnu++11',
], ],
'xcode_settings': { 'xcode_settings': {
'CC': '/usr/bin/clang', 'CC': '/usr/bin/clang',

1
script/update.py
View file

@ -32,6 +32,7 @@ def update_gyp():
subprocess.call([python, gyp, subprocess.call([python, gyp,
'-f', 'ninja', '--depth', '.', 'atom.gyp', '-f', 'ninja', '--depth', '.', 'atom.gyp',
'-Icommon.gypi', '-Ivendor/brightray/brightray.gypi', '-Icommon.gypi', '-Ivendor/brightray/brightray.gypi',
'-Dlinux_clang=0', # Disable brightray's clang setting
'-Dtarget_arch={0}'.format(arch), '-Dtarget_arch={0}'.format(arch),
'-Dlibrary=static_library']) '-Dlibrary=static_library'])