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

Unified Diff: build/common.gypi

Issue 1172903002: Set -fmsc-version appropriately for clang on VS2015 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: elseif Created 5 years, 6 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 | build/config/compiler/BUILD.gn » ('j') | build/config/compiler/BUILD.gn » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 58cc1fa284f727466412d59da0fdf3e42f5edb26..99426eb9692ff196bdfde6f9bda7a64c72367aa9 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -5696,8 +5696,6 @@
['clang==1', {
'VCCLCompilerTool': {
'AdditionalOptions': [
- '-fmsc-version=1800',
-
# Many files use intrinsics without including this header.
# TODO(hans): Fix those files, or move this to sub-GYPs.
'/FIIntrin.h',
@@ -5754,6 +5752,20 @@
],
},
}],
+ ['clang==1 and MSVS_VERSION == "2013"', {
+ 'VCCLCompilerTool': {
+ 'AdditionalOptions': [
+ '-fmsc-version=1800',
+ ],
+ },
+ }],
+ ['clang==1 and MSVS_VERSION == "2015"', {
+ 'VCCLCompilerTool': {
+ 'AdditionalOptions': [
+ '-fmsc-version=1900',
+ ],
+ },
+ }],
],
},
},
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | build/config/compiler/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698