Don't use Chromium sysroot.
The Chromium sysroot has a broken C++11 implementation that doesn't allow us to use <condition_variable> or <chrono>. So we need to use the system sysroot to use all C++11 features. Change-Id: I41bec7ebddf598e1bf0494ee8bb2844e67bc8acf
This commit is contained in:
parent
97cad858bf
commit
4c0d38bde3
|
@ -66,8 +66,10 @@ if __name__ == '__main__':
|
|||
|
||||
# Set these default GYP_DEFINES if user does not set the value explicitly.
|
||||
_DEFAULT_DEFINES = {'test_isolation_mode': 'noop',
|
||||
'use_custom_libcxx': 0,
|
||||
'use_glib': 0,
|
||||
'use_openssl': 1,
|
||||
'use_sysroot': 0,
|
||||
'use_x11': 0,
|
||||
'linux_use_bundled_binutils': 0,
|
||||
'linux_use_bundled_gold': 0,
|
||||
|
@ -78,9 +80,6 @@ if __name__ == '__main__':
|
|||
for key, value in _DEFAULT_DEFINES.items():
|
||||
if key not in gyp_defines:
|
||||
gyp_defines += ' {0}={1}'.format(key, value)
|
||||
# Somehow gcc don't like use_sysroot.
|
||||
if 'clang=0' in gyp_defines and 'use_sysroot' not in gyp_defines:
|
||||
gyp_defines += ' use_sysroot=0'
|
||||
os.environ['GYP_DEFINES'] = gyp_defines.strip()
|
||||
|
||||
# Default to ninja, but only if no generator has explicitly been set.
|
||||
|
|
|
@ -68,6 +68,10 @@
|
|||
# the code in CJK environment if there is non-ASCII characters
|
||||
# in the file.
|
||||
],
|
||||
'cflags': [
|
||||
# TODO(modmaker): Remove once Chromium base is removed.
|
||||
'-Wno-deprecated-declarations',
|
||||
],
|
||||
'conditions': [
|
||||
['clang==0', {
|
||||
'cflags': [
|
||||
|
|
Loading…
Reference in New Issue