Skip to content

Commit

Permalink
recognise gcc with appended version
Browse files Browse the repository at this point in the history
$CC may be something like "gcc-4.8", which needs to be recognised as gcc.
Note also that "gcc-4.8 --version" produces something like:

    gcc-4.8 (Homebrew gcc48 4.8.4) 4.8.4

so we have to deal with that additional "-4.8".
  • Loading branch information
PaulPrice committed Jul 9, 2015
1 parent f0c58bb commit 3a39a0e
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion python/lsst/sconsUtils/state.py
Original file line number Diff line number Diff line change
Expand Up @@ -236,7 +236,7 @@ def ClassifyCc(context):
@return (compiler, version) as a pair of strings, or ("unknown", "unknown") if unknown
"""
versionNameList = (
(r"gcc +\(.+\) +([0-9.a-zA-Z]+)", "gcc"),
(r"gcc(?:\-.+)? +\(.+\) +([0-9.a-zA-Z]+)", "gcc"),
(r"LLVM +version +([0-9.a-zA-Z]+) ", "clang"), # clang on Mac
(r"clang +version +([0-9.a-zA-Z]+) ", "clang"), # clang on linux
(r"\(ICC\) +([0-9.a-zA-Z]+) ", "icc"),
Expand Down

0 comments on commit 3a39a0e

Please sign in to comment.