diff options
| author | Bert Belder <bertbelder@gmail.com> | 2012-08-28 02:54:22 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2012-08-28 02:54:22 +0200 |
| commit | bf16d9280ea7aadce5c5437184c1d80e651a997a (patch) | |
| tree | 85c570a9c80181c9bd84ce8bcc726d644daa36db /common.gypi | |
| parent | 4822d780bb913c9ef7c2301a181a5834887cddb4 (diff) | |
| parent | 24184345688e1f545ffc87e5742de06ed9855007 (diff) | |
| download | nodejs-bf16d9280ea7aadce5c5437184c1d80e651a997a.tar.gz nodejs-bf16d9280ea7aadce5c5437184c1d80e651a997a.tar.bz2 nodejs-bf16d9280ea7aadce5c5437184c1d80e651a997a.zip | |
Merge branch 'v0.8'
Conflicts:
ChangeLog
deps/openssl/openssl.gyp
src/node_version.h
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/common.gypi b/common.gypi index 40d0b4562..f198d3312 100644 --- a/common.gypi +++ b/common.gypi @@ -66,9 +66,12 @@ }, { 'cflags!': [ '-ffunction-sections', '-fdata-sections' ], }], - ['clang==1 or gcc_version >= 40', { + ['clang == 0 and gcc_version >= 40', { 'cflags': [ '-fno-tree-vrp' ], }], + ['clang == 0 and gcc_version <= 44', { + 'cflags': [ '-fno-tree-sink' ], + }], ], }], ['OS=="solaris"', { @@ -190,7 +193,6 @@ 'GCC_ENABLE_PASCAL_STRINGS': 'NO', # No -mpascal-strings 'GCC_THREADSAFE_STATICS': 'NO', # -fno-threadsafe-statics 'GCC_VERSION': '4.2', - 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', # -Wnewline-eof 'PREBINDING': 'NO', # No -Wl,-prebind 'MACOSX_DEPLOYMENT_TARGET': '10.5', # -mmacosx-version-min=10.5 'USE_HEADERMAP': 'NO', |