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

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

Issue 1468643002: Tweaks to vs_toolchain to simplify it, and support gn VS 2015 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Remove default value for argument Created 5 years, 1 month 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 | build/toolchain/win/BUILD.gn » ('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 595 matching lines...) Expand 10 before | Expand all | Expand 10 after
606 cflags_cc = [] 606 cflags_cc = []
607 607
608 if (is_win) { 608 if (is_win) {
609 if (treat_warnings_as_errors) { 609 if (treat_warnings_as_errors) {
610 cflags += [ "/WX" ] 610 cflags += [ "/WX" ]
611 } 611 }
612 612
613 cflags += [ 613 cflags += [
614 # Warnings permanently disabled: 614 # Warnings permanently disabled:
615 615
616 # C4091: 'typedef ': ignored on left of 'X' when no variable is
617 # declared.
618 # This happens in a number of Windows headers. Dumb.
619 "/wd4091",
620
616 # C4127: conditional expression is constant 621 # C4127: conditional expression is constant
617 # This warning can in theory catch dead code and other problems, but 622 # This warning can in theory catch dead code and other problems, but
618 # triggers in far too many desirable cases where the conditional 623 # triggers in far too many desirable cases where the conditional
619 # expression is either set by macros or corresponds some legitimate 624 # expression is either set by macros or corresponds some legitimate
620 # compile-time constant expression (due to constant template args, 625 # compile-time constant expression (due to constant template args,
621 # conditionals comparing the sizes of different types, etc.). Some of 626 # conditionals comparing the sizes of different types, etc.). Some of
622 # these can be worked around, but it's not worth it. 627 # these can be worked around, but it's not worth it.
623 "/wd4127", 628 "/wd4127",
624 629
625 # C4251: 'identifier' : class 'type' needs to have dll-interface to be 630 # C4251: 'identifier' : class 'type' needs to have dll-interface to be
(...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after
670 # Warnings to evaluate and possibly fix/reenable later: 675 # Warnings to evaluate and possibly fix/reenable later:
671 676
672 "/wd4100", # Unreferenced formal function parameter. 677 "/wd4100", # Unreferenced formal function parameter.
673 "/wd4121", # Alignment of a member was sensitive to packing. 678 "/wd4121", # Alignment of a member was sensitive to packing.
674 "/wd4244", # Conversion: possible loss of data. 679 "/wd4244", # Conversion: possible loss of data.
675 "/wd4481", # Nonstandard extension: override specifier. 680 "/wd4481", # Nonstandard extension: override specifier.
676 "/wd4505", # Unreferenced local function has been removed. 681 "/wd4505", # Unreferenced local function has been removed.
677 "/wd4510", # Default constructor could not be generated. 682 "/wd4510", # Default constructor could not be generated.
678 "/wd4512", # Assignment operator could not be generated. 683 "/wd4512", # Assignment operator could not be generated.
679 "/wd4610", # Class can never be instantiated, constructor required. 684 "/wd4610", # Class can never be instantiated, constructor required.
685 "/wd4838", # Narrowing conversion. Doesn't seem to be very useful.
680 "/wd4995", # 'X': name was marked as #pragma deprecated 686 "/wd4995", # 'X': name was marked as #pragma deprecated
681 "/wd4996", # Deprecated function warning. 687 "/wd4996", # Deprecated function warning.
688
689 # These are variable shadowing warnings that are new in VS2015. We
690 # should work through these at some point -- they may be removed from
691 # the RTM release in the /W4 set.
692 "/wd4456",
693 "/wd4457",
694 "/wd4458",
695 "/wd4459",
682 ] 696 ]
683 697
684 # VS xtree header file needs to be patched or 4702 (unreachable code 698 # VS xtree header file needs to be patched or 4702 (unreachable code
685 # warning) is reported if _HAS_EXCEPTIONS=0. Disable the warning if xtree is 699 # warning) is reported if _HAS_EXCEPTIONS=0. Disable the warning if xtree is
686 # not patched. 700 # not patched.
687 if (!msvs_xtree_patched && 701 if (!msvs_xtree_patched &&
688 exec_script("../../win_is_xtree_patched.py", [], "value") == 0) { 702 exec_script("../../win_is_xtree_patched.py", [], "value") == 0) {
689 cflags += [ "/wd4702" ] # Unreachable code. 703 cflags += [ "/wd4702" ] # Unreachable code.
690 } 704 }
691 705
(...skipping 544 matching lines...) Expand 10 before | Expand all | Expand 10 after
1236 if (symbol_level == 0) { 1250 if (symbol_level == 0) {
1237 configs = [ ":no_symbols" ] 1251 configs = [ ":no_symbols" ]
1238 } else if (symbol_level == 1) { 1252 } else if (symbol_level == 1) {
1239 configs = [ ":minimal_symbols" ] 1253 configs = [ ":minimal_symbols" ]
1240 } else if (symbol_level == 2) { 1254 } else if (symbol_level == 2) {
1241 configs = [ ":symbols" ] 1255 configs = [ ":symbols" ]
1242 } else { 1256 } else {
1243 assert(false) 1257 assert(false)
1244 } 1258 }
1245 } 1259 }
OLDNEW
« no previous file with comments | « no previous file | build/toolchain/win/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698