|
10 | 10 | 'component%': 'static_library', # NB. these names match with what V8 expects |
11 | 11 | 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way |
12 | 12 | 'python%': 'python', |
13 | | - |
| 13 | + 'gas_version%': 0, |
| 14 | + 'llvm_version%': 0, |
| 15 | + |
14 | 16 | 'node_shared%': 'false', |
15 | 17 | 'force_dynamic_crt%': 0, |
16 | 18 | 'node_use_v8_platform%': 'true', |
|
211 | 213 | # and their sheer number drowns out other, more legitimate warnings. |
212 | 214 | 'DisableSpecificWarnings': ['4267'], |
213 | 215 | 'WarnAsError': 'false', |
| 216 | + 'AdditionalOptions': [ |
| 217 | + '/std:c++14' |
| 218 | + ], |
214 | 219 | }, |
215 | 220 | 'VCLibrarianTool': { |
216 | 221 | }, |
|
293 | 298 | }], |
294 | 299 | [ 'OS in "linux freebsd openbsd solaris android aix"', { |
295 | 300 | 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ], |
296 | | - 'cflags_cc': [ '-fno-rtti', '-fno-exceptions', '-std=gnu++0x' ], |
| 301 | + 'cflags_cc': [ '-fno-rtti', '-fno-exceptions' ], |
297 | 302 | 'ldflags': [ '-rdynamic' ], |
298 | 303 | 'target_conditions': [ |
299 | 304 | # The 1990s toolchain on SmartOS can't handle thin archives. |
|
409 | 414 | ['clang==1', { |
410 | 415 | 'xcode_settings': { |
411 | 416 | 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', |
412 | | - 'CLANG_CXX_LANGUAGE_STANDARD': 'gnu++0x', # -std=gnu++0x |
413 | 417 | 'CLANG_CXX_LIBRARY': 'libc++', |
414 | 418 | }, |
415 | 419 | }], |
|
431 | 435 | 'ldflags': [ |
432 | 436 | '-Wl,--export-dynamic', |
433 | 437 | ], |
434 | | - }] |
| 438 | + }], |
| 439 | + ['llvm_version != 0', { |
| 440 | + 'cflags': [ '-std=c++14' ], |
| 441 | + }, { |
| 442 | + 'cflags': [ '-std=gnu++11' ], |
| 443 | + }], |
435 | 444 | ], |
436 | 445 | } |
437 | 446 | } |
0 commit comments