Skip to content

Commit

Permalink
build,win: set /MP separately in Debug and Release
Browse files Browse the repository at this point in the history
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 <[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]>
  • Loading branch information
seishun authored and MylesBorins committed Nov 28, 2017
1 parent 2b1042b commit ccca11d
Showing 1 changed file with 4 additions and 3 deletions.
7 changes: 4 additions & 3 deletions common.gypi
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
'BasicRuntimeChecks': 3, # /RTC1
'AdditionalOptions': [
'/bigobj', # prevent error C1128 in VS2015
'/MP', # compile across multiple CPUs
],
},
'VCLinkerTool': {
Expand Down Expand Up @@ -167,6 +168,9 @@
'EnableFunctionLevelLinking': 'true',
'EnableIntrinsicFunctions': 'true',
'RuntimeTypeInfo': 'false',
'AdditionalOptions': [
'/MP', # compile across multiple CPUs
],
},
'VCLibrarianTool': {
'AdditionalOptions': [
Expand Down Expand Up @@ -199,9 +203,6 @@
# and their sheer number drowns out other, more legitimate warnings.
'DisableSpecificWarnings': ['4267'],
'WarnAsError': 'false',
'AdditionalOptions': [
'/MP', # compile across multiple CPUs
],
},
'VCLibrarianTool': {
},
Expand Down

0 comments on commit ccca11d

Please sign in to comment.