Skip to content
This repository was archived by the owner on Aug 31, 2018. It is now read-only.
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit b4fbfc7

Browse files
seishunaddaleax
authored andcommittedOct 26, 2017
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 <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 aa8ebaa commit b4fbfc7

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
@@ -120,6 +120,7 @@
120120
'BasicRuntimeChecks': 3, # /RTC1
121121
'AdditionalOptions': [
122122
'/bigobj', # prevent error C1128 in VS2015
123+
'/MP', # compile across multiple CPUs
123124
],
124125
},
125126
'VCLinkerTool': {
@@ -175,6 +176,9 @@
175176
'EnableFunctionLevelLinking': 'true',
176177
'EnableIntrinsicFunctions': 'true',
177178
'RuntimeTypeInfo': 'false',
179+
'AdditionalOptions': [
180+
'/MP', # compile across multiple CPUs
181+
],
178182
},
179183
'VCLibrarianTool': {
180184
'AdditionalOptions': [
@@ -207,9 +211,6 @@
207211
# and their sheer number drowns out other, more legitimate warnings.
208212
'DisableSpecificWarnings': ['4267'],
209213
'WarnAsError': 'false',
210-
'AdditionalOptions': [
211-
'/MP', # compile across multiple CPUs
212-
],
213214
},
214215
'VCLibrarianTool': {
215216
},

0 commit comments

Comments
 (0)
This repository has been archived.