From: isaacs Date: Tue, 24 Jul 2012 21:19:50 +0000 (-0700) Subject: v8: Reapply floating patches X-Git-Tag: v0.8.4~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2c487669f74aabff30d85813461ae9877fe913a3;p=platform%2Fupstream%2Fnodejs.git v8: Reapply floating patches --- diff --git a/deps/v8/build/common.gypi b/deps/v8/build/common.gypi index 7f084b8..1609197 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': ' /dev/null 2>&1) && echo -n "-m32" || true)', + 'm32flag': ' /dev/null 2>&1) && echo "-m32" || true)', }, 'cflags': [ '<(m32flag)' ], 'ldflags': [ '<(m32flag)' ], @@ -281,7 +280,7 @@ }], ['_toolset=="target"', { 'variables': { - 'm32flag': ' /dev/null 2>&1) && echo -n "-m32" || true)', + 'm32flag': ' /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',