summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authoraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 19:58:58 +0000
committeraa@chromium.org <aa@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-31 19:58:58 +0000
commit3fef6e6333038d40b7879288a212fda3e0650935 (patch)
tree111b07d7230fd03dd0f11049b9db5d83114fd47c /build
parent8a9c7bea4d5399b0ddd599d2fb32ec292899b70f (diff)
downloadchromium_src-3fef6e6333038d40b7879288a212fda3e0650935.zip
chromium_src-3fef6e6333038d40b7879288a212fda3e0650935.tar.gz
chromium_src-3fef6e6333038d40b7879288a212fda3e0650935.tar.bz2
Make the Visual Studio /MP flag configurable.
Review URL: http://codereview.chromium.org/160408 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22176 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'build')
-rw-r--r--build/common.gypi8
1 files changed, 8 insertions, 0 deletions
diff --git a/build/common.gypi b/build/common.gypi
index ebe9ad8..98a2c9e 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -72,6 +72,10 @@
# 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',
@@ -522,6 +526,10 @@
'WarningLevel': '3',
'WarnAsError': 'true',
'DebugInformationFormat': '3',
+ 'conditions': [
+ [ 'msvs_multi_core_compile',
+ {'AdditionalOptions': '/MP'}, ],
+ ],
},
'VCLibrarianTool': {
'AdditionalOptions': '/ignore:4221',