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

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

Issue 1488933002: Misc fixes for gn builds with VS 2015 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Disable C4267 for VC++ 2015 builds only Created 5 years 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 | « no previous file | google_apis/gcm/base/mcs_util_unittest.cc » ('j') | 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 import("//build/config/compiler/compiler.gni") 7 import("//build/config/compiler/compiler.gni")
8 import("//build/config/nacl/config.gni") 8 import("//build/config/nacl/config.gni")
9 import("//build/toolchain/ccache.gni") 9 import("//build/toolchain/ccache.gni")
10 10
(...skipping 735 matching lines...) Expand 10 before | Expand all | Expand 10 after
746 746
747 # These are variable shadowing warnings that are new in VS2015. We 747 # These are variable shadowing warnings that are new in VS2015. We
748 # should work through these at some point -- they may be removed from 748 # should work through these at some point -- they may be removed from
749 # the RTM release in the /W4 set. 749 # the RTM release in the /W4 set.
750 "/wd4456", 750 "/wd4456",
751 "/wd4457", 751 "/wd4457",
752 "/wd4458", 752 "/wd4458",
753 "/wd4459", 753 "/wd4459",
754 ] 754 ]
755 755
756 if (visual_studio_version == "2015") {
757 # VC++ 2015 changes 32-bit size_t truncation warnings from 4244 to 4267.
758 # Example: short TruncTest(size_t x) { return x; }
759 # Since we already disable 4244 we need to disable 4267 during migration.
760 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
761 cflags += [ "/wd4267" ]
762 }
763
756 # VS xtree header file needs to be patched or 4702 (unreachable code 764 # VS xtree header file needs to be patched or 4702 (unreachable code
757 # warning) is reported if _HAS_EXCEPTIONS=0. Disable the warning if xtree is 765 # warning) is reported if _HAS_EXCEPTIONS=0. Disable the warning if xtree is
758 # not patched. 766 # not patched.
759 if (!msvs_xtree_patched && 767 if (!msvs_xtree_patched &&
760 exec_script("../../win_is_xtree_patched.py", [], "value") == 0) { 768 exec_script("../../win_is_xtree_patched.py", [], "value") == 0) {
761 cflags += [ "/wd4702" ] # Unreachable code. 769 cflags += [ "/wd4702" ] # Unreachable code.
762 } 770 }
763 771
764 # Building with Clang on Windows is a work in progress and very 772 # Building with Clang on Windows is a work in progress and very
765 # experimental. See crbug.com/82385. 773 # experimental. See crbug.com/82385.
(...skipping 542 matching lines...) Expand 10 before | Expand all | Expand 10 after
1308 if (symbol_level == 0) { 1316 if (symbol_level == 0) {
1309 configs = [ ":no_symbols" ] 1317 configs = [ ":no_symbols" ]
1310 } else if (symbol_level == 1) { 1318 } else if (symbol_level == 1) {
1311 configs = [ ":minimal_symbols" ] 1319 configs = [ ":minimal_symbols" ]
1312 } else if (symbol_level == 2) { 1320 } else if (symbol_level == 2) {
1313 configs = [ ":symbols" ] 1321 configs = [ ":symbols" ]
1314 } else { 1322 } else {
1315 assert(false) 1323 assert(false)
1316 } 1324 }
1317 } 1325 }
OLDNEW
« no previous file with comments | « no previous file | google_apis/gcm/base/mcs_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698