sanchayanmaity/gem5
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

scons: Allow GNU assembler version strings with hyphen

Browse source 
Make scons a bit more forgiving when determining the GNU assembler version.
This commit is contained in:
Andreas Hansson 2015-06-09 09:21:11 -04:00
parent 6599dd87c8
commit b29e55d44a
1 changed files with 9 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
SConstruct
View file

@ -599,10 +599,16 @@ if main['GCC']:
# assemblers detect this as an error, "Error: expecting string # assemblers detect this as an error, "Error: expecting string
# instruction after `rep'" # instruction after `rep'"
if compareVersions(gcc_version, "4.8") > 0: if compareVersions(gcc_version, "4.8") > 0:
as_version = readCommand([main['AS'], '-v', '/dev/null'], as_version_raw = readCommand([main['AS'], '-v', '/dev/null'],
exception=False).split() 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 + \ print termcap.Yellow + termcap.Bold + \
'Warning: This combination of gcc and binutils have' + \ 'Warning: This combination of gcc and binutils have' + \
' known incompatibilities.\n' + \ ' known incompatibilities.\n' + \