Index: build/config/compiler/BUILD.gn |
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn |
index 9ca7d8fe903b59bd8a1473a2984bd53633e06ce2..ab0d6c5f06a9cc1d1d97975a26926d620b15c422 100644 |
--- a/build/config/compiler/BUILD.gn |
+++ b/build/config/compiler/BUILD.gn |
@@ -14,9 +14,6 @@ if (current_cpu == "arm") { |
if (current_cpu == "mipsel" || current_cpu == "mips64el") { |
import("//build/config/mips.gni") |
} |
-if (is_posix) { |
- import("//build/config/gcc/gcc_version.gni") |
-} |
if (is_win) { |
import("//build/config/win/visual_studio_version.gni") |
} |
@@ -795,26 +792,18 @@ config("default_warnings") { |
cflags += [ "-Wpartial-availability" ] |
} |
- if (gcc_version >= 48) { |
- cflags_cc += [ |
- # See comment for -Wno-c++11-narrowing. |
- "-Wno-narrowing", |
- ] |
- if (!is_clang && is_chromeos) { |
- cflags_cc += [ |
- # TODO(thakis): Remove, http://crbug.com/263960 |
- "-Wno-literal-suffix", |
- ] |
- } |
- } |
- |
# Suppress warnings about ABI changes on ARM (Clang doesn't give this |
# warning). |
if (current_cpu == "arm" && !is_clang) { |
cflags += [ "-Wno-psabi" ] |
} |
- if (gcc_version >= 48) { |
+ if (!is_clang) { |
+ cflags_cc += [ |
+ # See comment for -Wno-c++11-narrowing. |
+ "-Wno-narrowing", |
+ ] |
+ |
# Don't warn about the "typedef 'foo' locally defined but not used" |
# for gcc 4.8. |
# TODO: remove this flag once all builds work. See crbug.com/227506 |
@@ -831,6 +820,15 @@ config("default_warnings") { |
] |
} |
+ if (is_chromeos) { |
+ # TODO(thakis): Remove, http://crbug.com/263960 |
+ if (is_clang) { |
+ cflags_cc += [ "-Wno-reserved-user-defined-literal" ] |
+ } else { |
+ cflags_cc += [ "-Wno-literal-suffix" ] |
+ } |
+ } |
+ |
if (is_clang) { |
cflags += [ |
# TODO(thakis): Add -Wfor-loop-analysis to -Wall in clang, remove this: |
@@ -863,13 +861,6 @@ config("default_warnings") { |
"-Wno-inconsistent-missing-override", |
] |
- if (is_chromeos) { |
- cflags += [ |
- # TODO(thakis): Remove, http://crbug.com/263960 |
- "-Wno-reserved-user-defined-literal", |
- ] |
- } |
- |
# NaCl's Clang compiler and Chrome's hermetic Clang compiler will almost |
# always have different versions. Certain flags may not be recognized by |
# one version or the other. |