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

Side by Side 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, 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 | 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 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 if (is_clang) { 5 if (is_android) {
6 gcc_version = 0
7 } else if (is_android) {
8 import("//build/config/android/config.gni") 6 import("//build/config/android/config.gni")
9 if (is_android_webview_build) { 7 if (is_android_webview_build) {
10 gcc_version = 48 8 gcc_version = 48
11 } else { 9 } else {
12 gcc_version = 49 10 gcc_version = 49
13 } 11 }
12 } else if (current_toolchain == "//build/toolchain/cros:target") {
13 # TODO(benchan): Generalize the check for platforms other than Chrome OS.
14 gcc_version = exec_script("../../compiler_version.py", [ "target", "compiler" ], "value")
15 } else if (current_toolchain == "//build/toolchain/linux:x64" ||
16 current_toolchain == "//build/toolchain/linux:x86") {
17 # These are both the same and just use the default gcc on the system.
18 gcc_version = exec_script("../../compiler_version.py", [ "host", "compiler" ], "value")
14 } else { 19 } else {
15 gcc_version = exec_script("../../compiler_version.py", [ "host", "compiler" ] , "value") 20 gcc_version = 0
16 } 21 }
OLDNEW
« 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