| 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 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 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 += [ | 67 cflags += [ |
| 68 # Many files use intrinsics without including this header. | 68 # Many files use intrinsics without including this header. |
| 69 # TODO(hans): Fix those files, or move this to sub-GYPs. | 69 # TODO(hans): Fix those files, or move this to sub-GYPs, |
| 70 "/FIIntrin.h", | 70 # https://crbug.com/592745 |
| 71 "/FIintrin.h", |
| 71 ] | 72 ] |
| 72 | 73 |
| 73 if (visual_studio_version == "2013") { | 74 if (visual_studio_version == "2013") { |
| 74 cflags += [ "-fmsc-version=1800" ] | 75 cflags += [ "-fmsc-version=1800" ] |
| 75 } else if (visual_studio_version == "2015") { | 76 } else if (visual_studio_version == "2015") { |
| 76 cflags += [ "-fmsc-version=1900" ] | 77 cflags += [ "-fmsc-version=1900" ] |
| 77 } | 78 } |
| 78 | 79 |
| 79 if (current_cpu == "x86") { | 80 if (current_cpu == "x86") { |
| 80 cflags += [ "-m32" ] | 81 cflags += [ "-m32" ] |
| (...skipping 304 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 385 | 386 |
| 386 # Internal stuff -------------------------------------------------------------- | 387 # Internal stuff -------------------------------------------------------------- |
| 387 | 388 |
| 388 # Config used by the MIDL template to disable warnings. | 389 # Config used by the MIDL template to disable warnings. |
| 389 config("midl_warnings") { | 390 config("midl_warnings") { |
| 390 if (is_clang) { | 391 if (is_clang) { |
| 391 # MIDL generates code like "#endif !_MIDL_USE_GUIDDEF_". | 392 # MIDL generates code like "#endif !_MIDL_USE_GUIDDEF_". |
| 392 cflags = [ "-Wno-extra-tokens" ] | 393 cflags = [ "-Wno-extra-tokens" ] |
| 393 } | 394 } |
| 394 } | 395 } |
| OLD | NEW |