diff options
| author | isaacs <i@izs.me> | 2012-09-18 15:26:53 -0700 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2012-09-21 01:52:27 +0200 |
| commit | d77c24de3f817b4c63040ac44d33a24d59ab5475 (patch) | |
| tree | b863cc1e686fb71e76ba9a806eb1e1406a3a778c | |
| parent | 3411a03dd114d635800cc50749d2351cd734eb2a (diff) | |
| download | node-d77c24de3f817b4c63040ac44d33a24d59ab5475.tar.gz | |
V8: reapply floating patches
| -rw-r--r-- | deps/v8/build/common.gypi | 7 | ||||
| -rw-r--r-- | deps/v8/tools/gyp/v8.gyp | 3 |
2 files changed, 4 insertions, 6 deletions
diff --git a/deps/v8/build/common.gypi b/deps/v8/build/common.gypi index fdf4d9c30..3bcb03084 100644 --- a/deps/v8/build/common.gypi +++ b/deps/v8/build/common.gypi @@ -259,7 +259,6 @@ 'WIN32', ], 'msvs_configuration_attributes': { - 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', 'CharacterSet': '1', }, @@ -344,7 +343,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' ], }], ['OS=="android"', { @@ -367,10 +366,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 b646567b5..08500a413 100644 --- a/deps/v8/tools/gyp/v8.gyp +++ b/deps/v8/tools/gyp/v8.gyp @@ -728,6 +728,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' ], }, |