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

Unified Diff: build/compiler_version.py

Issue 1577093002: Remove gcc_version from gyp and gn files. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: moar Created 4 years, 11 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 | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/compiler_version.py
diff --git a/build/compiler_version.py b/build/compiler_version.py
index 05faf54454df5db32de33fddf0bf5723b297ebd8..8db0108110963c9077695b26aacaab9ac4c72fe7 100755
--- a/build/compiler_version.py
+++ b/build/compiler_version.py
@@ -32,7 +32,7 @@ def ParseArgs(args):
tool = args[1]
if mode not in ('host', 'target'):
raise Exception('Invalid mode: %s' % mode)
- if tool not in ('assembler', 'compiler', 'linker'):
+ if tool not in ('assembler',):
raise Exception('Invalid tool: %s' % tool)
return mode, tool
@@ -53,27 +53,12 @@ def GetVersion(compiler, tool):
return cached_version
try:
# Note that compiler could be something tricky like "distcc g++".
- if tool == "compiler":
- compiler = compiler + " -dumpversion"
- # 4.6
- version_re = re.compile(r"(\d+)\.(\d+)")
- elif tool == "assembler":
+ if tool == "assembler":
compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
# Unmodified: GNU assembler (GNU Binutils) 2.24
# Ubuntu: GNU assembler (GNU Binutils for Ubuntu) 2.22
# Fedora: GNU assembler version 2.23.2
version_re = re.compile(r"^GNU [^ ]+ .* (\d+).(\d+).*?$", re.M)
- elif tool == "linker":
- compiler = compiler + " -Xlinker --version"
- # Using BFD linker
- # Unmodified: GNU ld (GNU Binutils) 2.24
- # Ubuntu: GNU ld (GNU Binutils for Ubuntu) 2.22
- # Fedora: GNU ld version 2.23.2
- # Using Gold linker
- # Unmodified: GNU gold (GNU Binutils 2.24) 1.11
- # Ubuntu: GNU gold (GNU Binutils for Ubuntu 2.22) 1.11
- # Fedora: GNU gold (version 2.23.2) 1.11
- version_re = re.compile(r"^GNU [^ ]+ .* (\d+).(\d+).*?$", re.M)
else:
raise Exception("Unknown tool %s" % tool)
« no previous file with comments | « build/common.gypi ('k') | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698