Skip to content
This repository was archived by the owner on Aug 31, 2018. It is now read-only.

Commit 7019570

Browse files
seishunaddaleax
authored andcommitted
build,win: set /MP separately in Debug and Release
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: nodejs/node#16415 Fixes: nodejs/node#16367 Reviewed-By: Anna Henningsen <[email protected]> Reviewed-By: James M Snell <[email protected]> Reviewed-By: Colin Ihrig <[email protected]> Reviewed-By: Minwoo Jung <[email protected]> Reviewed-By: Tobias Nießen <[email protected]> Reviewed-By: Refael Ackermann <[email protected]>
1 parent 98df0e5 commit 7019570

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

common.gypi

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,6 +125,7 @@
125125
'BasicRuntimeChecks': 3, # /RTC1
126126
'AdditionalOptions': [
127127
'/bigobj', # prevent error C1128 in VS2015
128+
'/MP', # compile across multiple CPUs
128129
],
129130
},
130131
'VCLinkerTool': {
@@ -180,6 +181,9 @@
180181
'EnableFunctionLevelLinking': 'true',
181182
'EnableIntrinsicFunctions': 'true',
182183
'RuntimeTypeInfo': 'false',
184+
'AdditionalOptions': [
185+
'/MP', # compile across multiple CPUs
186+
],
183187
},
184188
'VCLibrarianTool': {
185189
'AdditionalOptions': [
@@ -212,9 +216,6 @@
212216
# and their sheer number drowns out other, more legitimate warnings.
213217
'DisableSpecificWarnings': ['4267'],
214218
'WarnAsError': 'false',
215-
'AdditionalOptions': [
216-
'/MP', # compile across multiple CPUs
217-
],
218219
},
219220
'VCLibrarianTool': {
220221
},

0 commit comments

Comments
 (0)