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

Unified Diff: build/config/gcc/gcc_version.gni

Issue 678183002: Fix gcc_version.gni to determine target GCC toolchain version for Chrome OS. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 2 months 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 side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/gcc/gcc_version.gni
diff --git a/build/config/gcc/gcc_version.gni b/build/config/gcc/gcc_version.gni
index 9b27c9047383c47ac603c7da528fe5f4bf27d2e9..1ff464ac0a6e1dd5c4431c854851f885d9a23420 100644
--- a/build/config/gcc/gcc_version.gni
+++ b/build/config/gcc/gcc_version.gni
@@ -2,15 +2,20 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
-if (is_clang) {
- gcc_version = 0
-} else if (is_android) {
+if (is_android) {
import("//build/config/android/config.gni")
if (is_android_webview_build) {
gcc_version = 48
} else {
gcc_version = 49
}
+} else if (current_toolchain == "//build/toolchain/cros:target") {
+ # TODO(benchan): Generalize the check for platforms other than Chrome OS.
+ 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 = exec_script("../../compiler_version.py", [ "host", "compiler" ], "value")
+ gcc_version = 0
}
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698