Remove gcc_version from gyp and gn files.

We used this to check if gcc is newer than 4.8 which is now required.
Remove the plumbing for this until we need to check gcc compiler versions
again, if ever.

No behavior change.

BUG=573778

Review URL: https://codereview.chromium.org/1577093002

Cr-Commit-Position: refs/heads/master@{#368706}

2 files changed, 15 insertions, 58 deletions

diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index 9ca7d8f..ab0d6c5 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.
diff --git a/build/config/gcc/gcc_version.gni b/build/config/gcc/gcc_version.gni
deleted file mode 100644
index eed1bc8..0000000
--- a/build/config/gcc/gcc_version.gni
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 2014 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-declare_args() {
-  # This allows the gcc_version to be overriden when using a custom toolchain.
-  # If the gcc_version is {X}.{Y}, set this value as XY.
-  gcc_version = -1
-}
-
-if (gcc_version == -1) {
-  if (is_android) {
-    gcc_version = 49
-  } else if (current_toolchain == "//build/toolchain/cros:target" ||
-             current_toolchain == "//build/toolchain/linux:mipsel") {
-    gcc_version = exec_script("../../compiler_version.py",
-                              [
-                                "target",
-                                "compiler",
-                              ],
-                              "value")
-  } else if (current_toolchain == "//build/toolchain/linux:x64" ||
-             current_toolchain == "//build/toolchain/linux:x86") {
-    # These are both the same and just use the default gcc on the system.
-    gcc_version = exec_script("../../compiler_version.py",
-                              [
-                                "host",
-                                "compiler",
-                              ],
-                              "value")
-  } else {
-    gcc_version = 0
-  }
-}