1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build,win: set /MP separately in Debug and Release

Browse Source 
Setting /MP globally causes it to appear twice in the command line due
to a GYP bug, which causes the project to be rebuilt unconditionally due
to an msbuild bug.

PR-URL: https://github.com/nodejs/node/pull/16415
Fixes: https://github.com/nodejs/node/issues/16367
Reviewed-By: Anna Henningsen <anna@addaleax.net>
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Reviewed-By: Minwoo Jung <minwoo@nodesource.com>
Reviewed-By: Tobias Nießen <tniessen@tnie.de>
Reviewed-By: Refael Ackermann <refack@gmail.com>
This commit is contained in:
Nikolai Vavilov 2017-10-23 19:37:03 +03:00
parent 47ed02cec6
commit 4108072457
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
common.gypi
View File

@ -120,6 +120,7 @@
'BasicRuntimeChecks': 3, # /RTC1 'BasicRuntimeChecks': 3, # /RTC1
'AdditionalOptions': [ 'AdditionalOptions': [
'/bigobj', # prevent error C1128 in VS2015 '/bigobj', # prevent error C1128 in VS2015
'/MP', # compile across multiple CPUs
], ],
}, },
'VCLinkerTool': { 'VCLinkerTool': {
@ -175,6 +176,9 @@
'EnableFunctionLevelLinking': 'true', 'EnableFunctionLevelLinking': 'true',
'EnableIntrinsicFunctions': 'true', 'EnableIntrinsicFunctions': 'true',
'RuntimeTypeInfo': 'false', 'RuntimeTypeInfo': 'false',
'AdditionalOptions': [
'/MP', # compile across multiple CPUs
],
}, },
'VCLibrarianTool': { 'VCLibrarianTool': {
'AdditionalOptions': [ 'AdditionalOptions': [
@ -207,9 +211,6 @@
# and their sheer number drowns out other, more legitimate warnings. # and their sheer number drowns out other, more legitimate warnings.
'DisableSpecificWarnings': ['4267'], 'DisableSpecificWarnings': ['4267'],
'WarnAsError': 'false', 'WarnAsError': 'false',
'AdditionalOptions': [
'/MP', # compile across multiple CPUs
],
}, },
'VCLibrarianTool': { 'VCLibrarianTool': {
}, },