From: Andreas Hansson <andreas.hansson@arm.com>
Date: Tue, 9 Jun 2015 13:21:11 +0000 (-0400)
Subject: scons: Allow GNU assembler version strings with hyphen
X-Git-Tag: stable_2015_09_03~9
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=b29e55d44a70de6ed126a03fcd938bfe34a3a8a5;p=gem5.git

scons: Allow GNU assembler version strings with hyphen

Make scons a bit more forgiving when determining the GNU assembler version.
---

diff --git a/SConstruct b/SConstruct
index d229960c2..981cd0da9 100755
--- a/SConstruct
+++ b/SConstruct
@@ -599,10 +599,16 @@ if main['GCC']:
     # assemblers detect this as an error, "Error: expecting string
     # instruction after `rep'"
     if compareVersions(gcc_version, "4.8") > 0:
-        as_version = readCommand([main['AS'], '-v', '/dev/null'],
-                                 exception=False).split()
+        as_version_raw = readCommand([main['AS'], '-v', '/dev/null'],
+                                     exception=False).split()
 
-        if not as_version or compareVersions(as_version[-1], "2.23") < 0:
+        # version strings may contain extra distro-specific
+        # qualifiers, so play it safe and keep only what comes before
+        # the first hyphen
+        as_version = as_version_raw[-1].split('-')[0] if as_version_raw \
+            else None
+
+        if not as_version or compareVersions(as_version, "2.23") < 0:
             print termcap.Yellow + termcap.Bold + \
                 'Warning: This combination of gcc and binutils have' + \
                 ' known incompatibilities.\n' + \