diff options
| author | Bert Belder <bertbelder@gmail.com> | 2012-08-21 03:05:25 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2012-09-06 15:58:37 +0200 |
| commit | c5e554dc7ef36c276760f55fb702b1ac0dfa4fa8 (patch) | |
| tree | b713717d99b273a9890452581a7a84d9a9486540 /deps | |
| parent | 4899116d4b24b50fa23ac1de9befd35d37c3bd29 (diff) | |
| download | node-c5e554dc7ef36c276760f55fb702b1ac0dfa4fa8.tar.gz | |
v8: reapply floating patches
Diffstat (limited to 'deps')
| -rw-r--r-- | deps/v8/build/common.gypi | 11 | ||||
| -rw-r--r-- | deps/v8/tools/gyp/v8.gyp | 3 |
2 files changed, 6 insertions, 8 deletions
diff --git a/deps/v8/build/common.gypi b/deps/v8/build/common.gypi index 7f084b8c1..160919787 100644 --- a/deps/v8/build/common.gypi +++ b/deps/v8/build/common.gypi @@ -239,7 +239,6 @@ 'WIN32', ], 'msvs_configuration_attributes': { - 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', 'CharacterSet': '1', }, @@ -271,7 +270,7 @@ 'target_conditions': [ ['_toolset=="host"', { 'variables': { - 'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)', + 'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)', }, 'cflags': [ '<(m32flag)' ], 'ldflags': [ '<(m32flag)' ], @@ -281,7 +280,7 @@ }], ['_toolset=="target"', { 'variables': { - 'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)', + 'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)', }, 'cflags': [ '<(m32flag)' ], 'ldflags': [ '<(m32flag)' ], @@ -324,7 +323,7 @@ }, 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { - 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', + 'cflags': [ '-Wno-unused-parameter', '-Wnon-virtual-dtor', '-Woverloaded-virtual' ], }], ], @@ -333,10 +332,6 @@ 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ or OS=="android"', { - 'cflags!': [ - '-O2', - '-Os', - ], 'cflags': [ '-fdata-sections', '-ffunction-sections', diff --git a/deps/v8/tools/gyp/v8.gyp b/deps/v8/tools/gyp/v8.gyp index ea82d3181..f742cc6f3 100644 --- a/deps/v8/tools/gyp/v8.gyp +++ b/deps/v8/tools/gyp/v8.gyp @@ -721,6 +721,9 @@ '../../src/win32-math.h', ], 'msvs_disabled_warnings': [4351, 4355, 4800], + 'direct_dependent_settings': { + 'msvs_disabled_warnings': [4351, 4355, 4800], + }, 'link_settings': { 'libraries': [ '-lwinmm.lib', '-lws2_32.lib' ], }, |