Chromium Code Reviews

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

Issue 1351683004: GN: Simplify config by unconditionalising a flag that nacl-clang recognises (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 5 years, 3 months ago
Use n/p to move between diff chunks; N/P to move between comments.
Jump to:
View unified diff |
« no previous file with comments | « no previous file | 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 import("//build/config/compiler/compiler.gni") 7 import("//build/config/compiler/compiler.gni")
8 import("//build/toolchain/ccache.gni") 8 import("//build/toolchain/ccache.gni")
9 9
10 if (current_cpu == "arm") { 10 if (current_cpu == "arm") {
(...skipping 1005 matching lines...)
1016 1016
1017 # Clang considers the `register` keyword as deprecated, but e.g. 1017 # Clang considers the `register` keyword as deprecated, but e.g.
1018 # code generated by flex (used in angle) contains that keyword. 1018 # code generated by flex (used in angle) contains that keyword.
1019 # http://crbug.com/255186 1019 # http://crbug.com/255186
1020 "-Wno-deprecated-register", 1020 "-Wno-deprecated-register",
1021 1021
1022 # TODO(thakis): This used to be implied by -Wno-unused-function, 1022 # TODO(thakis): This used to be implied by -Wno-unused-function,
1023 # which we no longer use. Check if it makes sense to remove 1023 # which we no longer use. Check if it makes sense to remove
1024 # this as well. http://crbug.com/316352 1024 # this as well. http://crbug.com/316352
1025 "-Wno-unneeded-internal-declaration", 1025 "-Wno-unneeded-internal-declaration",
1026
1027 # TODO(hans): Get this cleaned up, http://crbug.com/428099
1028 "-Wno-inconsistent-missing-override",
1026 ] 1029 ]
1027 1030
1028 if (is_posix && !is_mac && !is_ios) { 1031 if (is_posix && !is_mac && !is_ios) {
1029 default_warning_flags += [ 1032 default_warning_flags += [
1030 # TODO(thakis): Remove, http://crbug.com/263960 1033 # TODO(thakis): Remove, http://crbug.com/263960
1031 "-Wno-reserved-user-defined-literal", 1034 "-Wno-reserved-user-defined-literal",
1032 ] 1035 ]
1033 } 1036 }
1034 1037
1035 # NaCl's Clang compiler and Chrome's hermetic Clang compiler will almost 1038 # NaCl's Clang compiler and Chrome's hermetic Clang compiler will almost
1036 # always have different versions. Certain flags may not be recognized by 1039 # always have different versions. Certain flags may not be recognized by
1037 # one version or the other. 1040 # one version or the other.
1038 if (!is_nacl) { 1041 if (!is_nacl) {
1039 # Flags NaCl does not recognize. 1042 # Flags NaCl does not recognize.
1040 default_warning_flags += [ 1043 default_warning_flags += [
1041 # TODO(hans): Get this cleaned up, http://crbug.com/428099
1042 "-Wno-inconsistent-missing-override",
1043
1044 # TODO(thakis): Enable this, crbug.com/507717 1044 # TODO(thakis): Enable this, crbug.com/507717
1045 "-Wno-shift-negative-value", 1045 "-Wno-shift-negative-value",
1046 ] 1046 ]
1047 } 1047 }
1048 1048
1049 if (exec_script("//tools/clang/scripts/update.py", 1049 if (exec_script("//tools/clang/scripts/update.py",
1050 [ "--print-revision" ], 1050 [ "--print-revision" ],
1051 "trim string") != "245965-1") { 1051 "trim string") != "245965-1") {
1052 default_warning_flags += [ 1052 default_warning_flags += [
1053 # TODO(thakis): Move this into outer if once clang is rolled far enough 1053 # TODO(thakis): Move this into outer if once clang is rolled far enough
(...skipping 433 matching lines...)
1487 } else if (symbol_level == 1) { 1487 } else if (symbol_level == 1) {
1488 cflags = minimal_symbols_cflags 1488 cflags = minimal_symbols_cflags
1489 ldflags = minimal_symbols_ldflags 1489 ldflags = minimal_symbols_ldflags
1490 } else if (symbol_level == 2) { 1490 } else if (symbol_level == 2) {
1491 cflags = symbols_cflags 1491 cflags = symbols_cflags
1492 ldflags = symbols_ldflags 1492 ldflags = symbols_ldflags
1493 } else { 1493 } else {
1494 assert(false) 1494 assert(false)
1495 } 1495 }
1496 } 1496 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine