diff options
| author | Ben Noordhuis <info@bnoordhuis.nl> | 2012-08-17 13:05:20 +0200 |
|---|---|---|
| committer | Ben Noordhuis <info@bnoordhuis.nl> | 2012-08-17 13:05:20 +0200 |
| commit | a177f55b0c022b5a77e9660beea5e190bc4c6e88 (patch) | |
| tree | 969156e456a55ad3470a64fb3bca1806c8020463 /common.gypi | |
| parent | 90ea68107a94b33e6b20cd9c2af8547b8c41da7c (diff) | |
| parent | 9918e5d4f6fbc8fe63d0395170a2daef2484d17a (diff) | |
| download | node-new-a177f55b0c022b5a77e9660beea5e190bc4c6e88.tar.gz | |
Merge remote-tracking branch 'origin/v0.8'
Conflicts:
ChangeLog
src/node_version.h
test/message/stdin_messages.out
tools/install.py
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi index 3ceedc7741..d8cb5323af 100644 --- a/common.gypi +++ b/common.gypi @@ -7,6 +7,8 @@ 'library%': 'static_library', # allow override to 'shared_library' for DLL/.so builds 'component%': 'static_library', # NB. these names match with what V8 expects 'msvs_multi_core_compile': '0', # we do enable multicore compiles, but not using the V8 way + 'gcc_version%': 'unknown', + 'clang%': 0, # Turn on optimizations that may trigger compiler bugs. # Use at your own risk. Do *NOT* report bugs if this option is enabled. @@ -53,7 +55,7 @@ 'cflags': [ '-O3', '-ffunction-sections', '-fdata-sections' ], 'ldflags': [ '-Wl,--gc-sections' ], }, { - 'cflags': [ '-O2', '-fno-strict-aliasing', '-fno-tree-vrp' ], + 'cflags': [ '-O2', '-fno-strict-aliasing' ], 'cflags!': [ '-O3', '-fstrict-aliasing' ], 'conditions': [ # Required by the dtrace post-processor. Unfortunately, @@ -64,6 +66,9 @@ }, { 'cflags!': [ '-ffunction-sections', '-fdata-sections' ], }], + ['clang==1 or gcc_version >= 40', { + 'cflags': [ '-fno-tree-vrp' ], + }], ], }], ['OS=="solaris"', { |