| OLD | NEW |
| 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/compiler/compiler.gni") | 5 import("//build/config/compiler/compiler.gni") |
| 6 import("//build/config/sanitizers/sanitizers.gni") | 6 import("//build/config/sanitizers/sanitizers.gni") |
| 7 import("//build/config/win/visual_studio_version.gni") | 7 import("//build/config/win/visual_studio_version.gni") |
| 8 import("//build/toolchain/toolchain.gni") | 8 import("//build/toolchain/toolchain.gni") |
| 9 | 9 |
| 10 assert(is_win) | 10 assert(is_win) |
| (...skipping 46 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 57 # they are disabled on other platforms. See crbug.com/587210 | 57 # they are disabled on other platforms. See crbug.com/587210 |
| 58 # and -fno-threadsafe-statics. | 58 # and -fno-threadsafe-statics. |
| 59 "/Zc:threadSafeInit-", | 59 "/Zc:threadSafeInit-", |
| 60 ] | 60 ] |
| 61 } | 61 } |
| 62 | 62 |
| 63 # Building with Clang on Windows is a work in progress and very | 63 # Building with Clang on Windows is a work in progress and very |
| 64 # experimental. See crbug.com/82385. | 64 # experimental. See crbug.com/82385. |
| 65 # Keep this in sync with the similar block in build/common.gypi | 65 # Keep this in sync with the similar block in build/common.gypi |
| 66 if (is_clang) { | 66 if (is_clang) { |
| 67 cflags += [ | |
| 68 # Many files use intrinsics without including this header. | |
| 69 # TODO(hans): Fix those files, or move this to sub-GYPs, | |
| 70 # https://crbug.com/592745 | |
| 71 "/FIintrin.h", | |
| 72 ] | |
| 73 | |
| 74 if (visual_studio_version == "2013") { | 67 if (visual_studio_version == "2013") { |
| 75 cflags += [ "-fmsc-version=1800" ] | 68 cflags += [ "-fmsc-version=1800" ] |
| 76 } else if (visual_studio_version == "2015") { | 69 } else if (visual_studio_version == "2015") { |
| 77 cflags += [ "-fmsc-version=1900" ] | 70 cflags += [ "-fmsc-version=1900" ] |
| 78 } | 71 } |
| 79 | 72 |
| 80 if (current_cpu == "x86") { | 73 if (current_cpu == "x86") { |
| 81 cflags += [ "-m32" ] | 74 cflags += [ "-m32" ] |
| 82 } else { | 75 } else { |
| 83 cflags += [ "-m64" ] | 76 cflags += [ "-m64" ] |
| (...skipping 302 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 386 | 379 |
| 387 # Internal stuff -------------------------------------------------------------- | 380 # Internal stuff -------------------------------------------------------------- |
| 388 | 381 |
| 389 # Config used by the MIDL template to disable warnings. | 382 # Config used by the MIDL template to disable warnings. |
| 390 config("midl_warnings") { | 383 config("midl_warnings") { |
| 391 if (is_clang) { | 384 if (is_clang) { |
| 392 # MIDL generates code like "#endif !_MIDL_USE_GUIDDEF_". | 385 # MIDL generates code like "#endif !_MIDL_USE_GUIDDEF_". |
| 393 cflags = [ "-Wno-extra-tokens" ] | 386 cflags = [ "-Wno-extra-tokens" ] |
| 394 } | 387 } |
| 395 } | 388 } |
| OLD | NEW |