Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(861)

Unified Diff: build/common.gypi

Issue 159732: Making /MP on by default for msvs2008. (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
===================================================================
--- build/common.gypi (revision 22205)
+++ build/common.gypi (working copy)
@@ -72,10 +72,6 @@
# but that doesn't work as we'd like.
'msvs_debug_link_incremental%': '2',
- # Whether to use multiple cores to compile with visual studio. This is
- # optional because it sometimes causes corruption on VS 2005.
- 'msvs_multi_core_compile%': '',
-
# The architecture that we're building on.
'target_arch%': 'ia32',
@@ -106,6 +102,21 @@
# path is set here. It should be the final location of the Chromium binary
# on the system.
'linux_sandbox_chrome_path%': '/opt/google/chrome/chrome',
+
+ 'conditions': [
+ # Whether to use multiple cores to compile with visual studio. This is
+ # optional because it sometimes causes corruption on VS 2005.
+ # It is on by default on VS 2008 and off on VS 2005.
+ ['OS=="win"', {
+ 'conditions': [
+ ['MSVS_VERSION=="2005"', {
+ 'msvs_multi_core_compile%': 0,
+ },{
+ 'msvs_multi_core_compile%': 1,
+ }],
+ ],
+ }],
+ ],
},
'target_defaults': {
'conditions': [
@@ -527,8 +538,9 @@
'WarnAsError': 'true',
'DebugInformationFormat': '3',
'conditions': [
- [ 'msvs_multi_core_compile',
- {'AdditionalOptions': '/MP'}, ],
+ [ 'msvs_multi_core_compile', {
+ 'AdditionalOptions': '/MP',
+ }],
],
},
'VCLibrarianTool': {
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698