Skip to content

Commit b5c6d59

Browse files
seishungibfahn
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: #16415 Fixes: #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>
1 parent 3638694 commit b5c6d59

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

common.gypi

+4-3
Original file line numberDiff line numberDiff line change
@@ -116,6 +116,7 @@
116116
'BasicRuntimeChecks': 3, # /RTC1
117117
'AdditionalOptions': [
118118
'/bigobj', # prevent error C1128 in VS2015
119+
'/MP', # compile across multiple CPUs
119120
],
120121
},
121122
'VCLinkerTool': {
@@ -171,6 +172,9 @@
171172
'EnableFunctionLevelLinking': 'true',
172173
'EnableIntrinsicFunctions': 'true',
173174
'RuntimeTypeInfo': 'false',
175+
'AdditionalOptions': [
176+
'/MP', # compile across multiple CPUs
177+
],
174178
},
175179
'VCLibrarianTool': {
176180
'AdditionalOptions': [
@@ -203,9 +207,6 @@
203207
# and their sheer number drowns out other, more legitimate warnings.
204208
'DisableSpecificWarnings': ['4267'],
205209
'WarnAsError': 'false',
206-
'AdditionalOptions': [
207-
'/MP', # compile across multiple CPUs
208-
],
209210
},
210211
'VCLibrarianTool': {
211212
},

0 commit comments

Comments
 (0)