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

Unified Diff: build/compiler_version.py

Issue 195923004: Fixing compiler_version for Fedora. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 9 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/compiler_version.py
diff --git a/build/compiler_version.py b/build/compiler_version.py
index bc3bee55947e0ef009e03868eb1e9f3503e73901..b06712d25b2d3c25990a97f99a630a66c703ce0b 100755
--- a/build/compiler_version.py
+++ b/build/compiler_version.py
@@ -25,12 +25,21 @@ def GetVersion(compiler, tool):
version_re = re.compile(r"(\d+)\.(\d+)")
elif tool == "assembler":
compiler = compiler + " -Xassembler --version -x assembler -c /dev/null"
- # GNU assembler (GNU Binutils for Ubuntu) 2.22
- version_re = re.compile(r"GNU [^ ]+ \(.*\) (\d+).(\d+)")
+ # 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"
- # GNU gold (GNU Binutils for Ubuntu 2.22) 1.11
- version_re = re.compile(r"GNU [^ ]+ \(.*\) (\d+).(\d+)")
+ # 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 | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698