diff options
| author | Jens Verwiebe <info@jensverwiebe.de> | 2014-02-10 17:55:34 +0400 |
|---|---|---|
| committer | Jens Verwiebe <info@jensverwiebe.de> | 2014-02-10 17:55:44 +0400 |
| commit | 6b7f03678ec39a78c7b16800444b261de9af1a72 (patch) | |
| tree | 3724f9400b5b28780ea03cefa101f23f7a50bfb4 /SConstruct | |
| parent | 644ca76356223f95d824ecdf13e57b6f2b14650f (diff) | |
OSX/scons: fix breakage after clang-openmp commit:
use the svn clang version instead of Apple compiler naming,
this also makes Brecht’s cycles sse/avx conditionals behave right
Diffstat (limited to 'SConstruct')
| -rw-r--r-- | SConstruct | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index ac5ee06d00c..085c626f2a5 100644 --- a/SConstruct +++ b/SConstruct @@ -287,9 +287,9 @@ if env['OURPLATFORM']=='darwin': command = ["%s"%env['CC'], "--version"] process = subprocess.Popen(command, stdout=subprocess.PIPE, stderr=None, shell=False) line = process.communicate()[0] - ver = re.search(r'[0-9]+(\.[0-9]+)+', line) + ver = re.search(r'[0-9]+(\.[0-9]+[svn]+)+', line) or re.search(r'[0-9]+(\.[0-9]+)+', line) # read the "based on LLVM x.xsvn" version here, not the Apple version if ver: - env['CCVERSION'] = ver.group(0) + env['CCVERSION'] = ver.group(0).strip('svn') frontend = re.search(r'gcc', line) or re.search(r'clang', line) or re.search(r'llvm-gcc', line) or re.search(r'icc', line) if frontend: env['C_COMPILER_ID'] = frontend.group(0) |