diff options
| author | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-12-01 19:43:34 -0800 |
|---|---|---|
| committer | Timothy J Fontaine <tjfontaine@gmail.com> | 2013-12-01 19:43:34 -0800 |
| commit | 001f9b46e72ac98b29b845630bfc88d481c559ad (patch) | |
| tree | 9b9bf605772acb69ec435f7a1dac87d10b9f3db9 /common.gypi | |
| parent | 5ce4eed54dceb15c34d3508e733124edd282601b (diff) | |
| parent | 6877e64fa8ebd1a1017bb4e298a007d98136c133 (diff) | |
| download | node-new-001f9b46e72ac98b29b845630bfc88d481c559ad.tar.gz | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
src/stream_wrap.cc
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/common.gypi b/common.gypi index 61172ef238..877464af3e 100644 --- a/common.gypi +++ b/common.gypi @@ -55,7 +55,6 @@ 'msvs_configuration_platform': 'x64', }], ['OS=="solaris"', { - 'cflags': [ '-fno-omit-frame-pointer' ], # pull in V8's postmortem metadata 'ldflags': [ '-Wl,-z,allextract' ] }, { @@ -68,6 +67,9 @@ ['clang == 0 and gcc_version <= 44', { 'cflags': [ '-fno-tree-sink' ], # Work around compiler bug. }], + ['OS!="mac" and OS!="win"', { + 'cflags': [ '-fno-omit-frame-pointer' ], + }], ], 'msvs_settings': { 'VCCLCompilerTool': { |