Skip to content

Commit 1c1ad9b

Browse files
committed
v8: reapply floating patches
1 parent 5b5c8b6 commit 1c1ad9b

File tree

1 file changed

+3
-4
lines changed

1 file changed

+3
-4
lines changed

deps/v8/build/common.gypi

+3-4
Original file line numberDiff line numberDiff line change
@@ -239,7 +239,6 @@
239239
'WIN32',
240240
],
241241
'msvs_configuration_attributes': {
242-
'OutputDirectory': '<(DEPTH)\\build\\$(ConfigurationName)',
243242
'IntermediateDirectory': '$(OutDir)\\obj\\$(ProjectName)',
244243
'CharacterSet': '1',
245244
},
@@ -271,7 +270,7 @@
271270
'target_conditions': [
272271
['_toolset=="host"', {
273272
'variables': {
274-
'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)',
273+
'm32flag': '<!((echo | $(echo ${CXX_host:-$(which g++)}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)',
275274
},
276275
'cflags': [ '<(m32flag)' ],
277276
'ldflags': [ '<(m32flag)' ],
@@ -281,7 +280,7 @@
281280
}],
282281
['_toolset=="target"', {
283282
'variables': {
284-
'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo -n "-m32" || true)',
283+
'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)',
285284
},
286285
'cflags': [ '<(m32flag)' ],
287286
'ldflags': [ '<(m32flag)' ],
@@ -324,7 +323,7 @@
324323
},
325324
'conditions': [
326325
['OS=="linux" or OS=="freebsd" or OS=="openbsd" or OS=="netbsd"', {
327-
'cflags': [ '-Wall', '<(werror)', '-W', '-Wno-unused-parameter',
326+
'cflags': [ '-Wno-unused-parameter',
328327
'-Wnon-virtual-dtor', '-Woverloaded-virtual' ],
329328
}],
330329
],

0 commit comments

Comments
 (0)