summaryrefslogtreecommitdiff
path: root/chromium/build/compiler_version.py
diff options
context:
space:
mode:
authorAllan Sandfeld Jensen <allan.jensen@theqtcompany.com>2016-01-25 11:39:07 +0100
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2016-01-25 15:20:42 +0000
commit6c91641271e536ffaa88a1dff5127e42ee99a91e (patch)
tree703d9dd49602377ddc90cbf886aad37913f2496b /chromium/build/compiler_version.py
parentb145b7fafd36f0c260d6a768c81fc14e32578099 (diff)
downloadqtwebengine-chromium-6c91641271e536ffaa88a1dff5127e42ee99a91e.tar.gz
BASELINE: Update Chromium to 49.0.2623.23
Also adds missing printing sources. Change-Id: I3726b8f0c7d6751c9fc846096c571fadca7108cd Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Diffstat (limited to 'chromium/build/compiler_version.py')
-rwxr-xr-xchromium/build/compiler_version.py19
1 files changed, 2 insertions, 17 deletions
diff --git a/chromium/build/compiler_version.py b/chromium/build/compiler_version.py
index 05faf54454d..8db01081109 100755
--- a/chromium/build/compiler_version.py
+++ b/chromium/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)