diff options
| author | Nikolai Vavilov <vvnicholas@gmail.com> | 2017-10-23 19:37:03 +0300 |
|---|---|---|
| committer | Nikolai Vavilov <vvnicholas@gmail.com> | 2017-10-24 21:34:33 +0300 |
| commit | 41080724571074d19f4975cc7748708ef42a040c (patch) | |
| tree | ed38fafdf9cd215cf4521ab3562c412641e8bccd /common.gypi | |
| parent | 47ed02cec652678a45699674112347cb22e91d7b (diff) | |
| download | android-node-v8-41080724571074d19f4975cc7748708ef42a040c.tar.gz android-node-v8-41080724571074d19f4975cc7748708ef42a040c.tar.bz2 android-node-v8-41080724571074d19f4975cc7748708ef42a040c.zip | |
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: https://github.com/nodejs/node/pull/16415
Fixes: https://github.com/nodejs/node/issues/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>
Diffstat (limited to 'common.gypi')
| -rw-r--r-- | common.gypi | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/common.gypi b/common.gypi index 10adc55654..c55c84f5cc 100644 --- a/common.gypi +++ b/common.gypi @@ -120,6 +120,7 @@ 'BasicRuntimeChecks': 3, # /RTC1 'AdditionalOptions': [ '/bigobj', # prevent error C1128 in VS2015 + '/MP', # compile across multiple CPUs ], }, 'VCLinkerTool': { @@ -175,6 +176,9 @@ 'EnableFunctionLevelLinking': 'true', 'EnableIntrinsicFunctions': 'true', 'RuntimeTypeInfo': 'false', + 'AdditionalOptions': [ + '/MP', # compile across multiple CPUs + ], }, 'VCLibrarianTool': { 'AdditionalOptions': [ @@ -207,9 +211,6 @@ # and their sheer number drowns out other, more legitimate warnings. 'DisableSpecificWarnings': ['4267'], 'WarnAsError': 'false', - 'AdditionalOptions': [ - '/MP', # compile across multiple CPUs - ], }, 'VCLibrarianTool': { }, |