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 /node.gyp | |
| parent | 5ce4eed54dceb15c34d3508e733124edd282601b (diff) | |
| parent | 6877e64fa8ebd1a1017bb4e298a007d98136c133 (diff) | |
| download | node-001f9b46e72ac98b29b845630bfc88d481c559ad.tar.gz | |
Merge remote-tracking branch 'upstream/v0.10'
Conflicts:
src/stream_wrap.cc
Diffstat (limited to 'node.gyp')
| -rw-r--r-- | node.gyp | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -319,6 +319,12 @@ 'PLATFORM="sunos"', ], }], + [ + 'OS=="linux"', { + 'ldflags': [ + '-Wl,--whole-archive <(PRODUCT_DIR)/obj.target/deps/v8/tools/gyp/libv8_base.<(target_arch).a -Wl,--no-whole-archive', + ], + }], ], 'msvs_settings': { 'VCLinkerTool': { |