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

Side by Side Diff: build/config/compiler/BUILD.gn

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 unified diff | Download patch
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 import("//build/config/android/config.gni") 5 import("//build/config/android/config.gni")
6 import("//build/config/chrome_build.gni") 6 import("//build/config/chrome_build.gni")
7 if (current_cpu == "arm") { 7 if (current_cpu == "arm") {
8 import("//build/config/arm.gni") 8 import("//build/config/arm.gni")
9 } 9 }
10 if (current_cpu == "mipsel" || current_cpu == "mips64el") { 10 if (current_cpu == "mipsel" || current_cpu == "mips64el") {
(...skipping 90 matching lines...) Expand 10 before | Expand all | Expand 10 after
101 "/Gy", # Enable function-level linking. 101 "/Gy", # Enable function-level linking.
102 "/GS", # Enable buffer security checking. 102 "/GS", # Enable buffer security checking.
103 "/FS", # Preserve previous PDB behavior. 103 "/FS", # Preserve previous PDB behavior.
104 ] 104 ]
105 105
106 # Building with Clang on Windows is a work in progress and very 106 # Building with Clang on Windows is a work in progress and very
107 # experimental. See crbug.com/82385. 107 # experimental. See crbug.com/82385.
108 # Keep this in sync with the similar block in build/common.gypi 108 # Keep this in sync with the similar block in build/common.gypi
109 if (is_clang) { 109 if (is_clang) {
110 cflags += [ 110 cflags += [
111 "-fmsc-version=1800",
112
113 # Many files use intrinsics without including this header. 111 # Many files use intrinsics without including this header.
114 # TODO(hans): Fix those files, or move this to sub-GYPs. 112 # TODO(hans): Fix those files, or move this to sub-GYPs.
115 "/FIIntrin.h", 113 "/FIIntrin.h",
116 ] 114 ]
115
116 if (visual_studio_version == "2013") {
hans 2015/06/10 18:05:38 This buildbot seems sad because of this: http://bu
117 cflags += [ "-fmsc-version=1800" ]
118 } else if (visual_studio_version == "2015") {
119 cflags += [ "-fmsc-version=1900" ]
120 }
121
117 if (current_cpu == "x86") { 122 if (current_cpu == "x86") {
118 cflags += [ 123 cflags += [
119 "/fallback", 124 "/fallback",
120 "-m32", 125 "-m32",
121 ] 126 ]
122 } else { 127 } else {
123 cflags += [ "-m64" ] 128 cflags += [ "-m64" ]
124 } 129 }
125 } 130 }
126 } else { 131 } else {
(...skipping 1121 matching lines...) Expand 10 before | Expand all | Expand 10 after
1248 cflags += [ "-gsplit-dwarf" ] 1253 cflags += [ "-gsplit-dwarf" ]
1249 } 1254 }
1250 } 1255 }
1251 } 1256 }
1252 1257
1253 config("no_symbols") { 1258 config("no_symbols") {
1254 if (!is_win) { 1259 if (!is_win) {
1255 cflags = [ "-g0" ] 1260 cflags = [ "-g0" ]
1256 } 1261 }
1257 } 1262 }
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698