Skip to content
Permalink
Browse files

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>
  • Loading branch information...
seishun authored and MylesBorins committed Oct 23, 2017
1 parent 2b1042b commit ccca11d0268723d6772d2665a7ef774fe9da06cf
Showing with 4 additions and 3 deletions.
  1. +4 −3 common.gypi
@@ -112,6 +112,7 @@
'BasicRuntimeChecks': 3, # /RTC1
'AdditionalOptions': [
'/bigobj', # prevent error C1128 in VS2015
'/MP', # compile across multiple CPUs
],
},
'VCLinkerTool': {
@@ -167,6 +168,9 @@
'EnableFunctionLevelLinking': 'true',
'EnableIntrinsicFunctions': 'true',
'RuntimeTypeInfo': 'false',
'AdditionalOptions': [
'/MP', # compile across multiple CPUs
],
},
'VCLibrarianTool': {
'AdditionalOptions': [
@@ -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': {
},

0 comments on commit ccca11d

Please sign in to comment.
You can’t perform that action at this time.