diff options
| author | Bert Belder <bertbelder@gmail.com> | 2012-08-21 03:04:16 +0200 |
|---|---|---|
| committer | Bert Belder <bertbelder@gmail.com> | 2012-08-21 03:04:16 +0200 |
| commit | 2d9239359db7ba8d23761ca18cef9455f812f111 (patch) | |
| tree | 9e498ffa5ad73111b1e354d4518478973b23f8a3 /deps/v8/build/common.gypi | |
| parent | d38d7bea6c08ba9b1367ebd44f9ade1154e3d04d (diff) | |
| download | node-new-2d9239359db7ba8d23761ca18cef9455f812f111.tar.gz | |
v8: upgrade to v3.11.10.19
Diffstat (limited to 'deps/v8/build/common.gypi')
| -rw-r--r-- | deps/v8/build/common.gypi | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/deps/v8/build/common.gypi b/deps/v8/build/common.gypi index 1609197876..7f084b8c1d 100644 --- a/deps/v8/build/common.gypi +++ b/deps/v8/build/common.gypi @@ -239,6 +239,7 @@ 'WIN32', ], 'msvs_configuration_attributes': { + 'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)', 'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)', 'CharacterSet': '1', }, @@ -270,7 +271,7 @@ 'target_conditions': [ ['_toolset=="host"', { 'variables': { - 'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)', + 'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)', }, 'cflags': [ '<(m32flag)' ], 'ldflags': [ '<(m32flag)' ], @@ -280,7 +281,7 @@ }], ['_toolset=="target"', { 'variables': { - 'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)', + 'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)', }, 'cflags': [ '<(m32flag)' ], 'ldflags': [ '<(m32flag)' ], @@ -323,7 +324,7 @@ }, 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', { - 'cflags': [ '-Wno-unused-parameter', + 'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter', '-Wnon-virtual-dtor', '-Woverloaded-virtual' ], }], ], @@ -332,6 +333,10 @@ 'conditions': [ ['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd" \ or OS=="android"', { + 'cflags!': [ + '-O2', + '-Os', + ], 'cflags': [ '-fdata-sections', '-ffunction-sections', |