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

Move project-specific flags to common.gypi.

Browse source
This commit is contained in:
Haojian Wu 2016-08-11 20:55:56 +02:00
parent 42a5b1f5bc
commit fc36048d78
2 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
common.gypi
View file

@ -102,6 +102,7 @@
'-Wno-return-type', '-Wno-return-type',
'-Wno-gnu-folding-constant', '-Wno-gnu-folding-constant',
'-Wno-shift-negative-value', '-Wno-shift-negative-value',
'-Wno-varargs', # https://git.io/v6Olj
], ],
}, },
'conditions': [ 'conditions': [
@ -117,6 +118,7 @@
'-Wno-deprecated-declarations', '-Wno-deprecated-declarations',
'-Wno-return-type', '-Wno-return-type',
'-Wno-shift-negative-value', '-Wno-shift-negative-value',
'-Wno-varargs', # https://git.io/v6Olj
# Required when building as shared library. # Required when building as shared library.
'-fPIC', '-fPIC',
], ],

7
toolchain.gypi
View file

@ -5,11 +5,6 @@
# Set this to true when building with Clang. # Set this to true when building with Clang.
'clang%': 1, 'clang%': 1,
'clang_warning_flags': [
'-Wno-undefined-var-template', # https://crbug.com/604888
'-Wno-varargs', # https://git.io/v6Olj
],
'variables': { 'variables': {
# The minimum macOS SDK version to use. # The minimum macOS SDK version to use.
'mac_sdk_min%': '10.10', 'mac_sdk_min%': '10.10',
@ -109,7 +104,6 @@
'cflags_cc': [ 'cflags_cc': [
'-std=c++11', '-std=c++11',
], ],
'cflags': [ '<@(clang_warning_flags)' ],
'xcode_settings': { 'xcode_settings': {
'CC': '<(make_clang_dir)/bin/clang', 'CC': '<(make_clang_dir)/bin/clang',
'LDPLUSPLUS': '<(make_clang_dir)/bin/clang++', 'LDPLUSPLUS': '<(make_clang_dir)/bin/clang++',
@ -117,7 +111,6 @@
'-fcolor-diagnostics', '-fcolor-diagnostics',
], ],
'WARNING_CFLAGS': ['<@(clang_warning_flags)'],
'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99 'GCC_C_LANGUAGE_STANDARD': 'c99', # -std=c99
'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++ 'CLANG_CXX_LIBRARY': 'libc++', # -stdlib=libc++
'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', # -std=c++11 'CLANG_CXX_LANGUAGE_STANDARD': 'c++11', # -std=c++11