sandey/blender
1
0
Fork 0
forked from bartvdbraak/blender
Code Pull Requests Activity

OSX/scons: fix breakage after clang-openmp commit:

Browse Source 
use the svn clang version instead of Apple compiler naming,
this also makes Brecht’s cycles sse/avx conditionals behave right
This commit is contained in:
Jens Verwiebe 2014-02-10 14:55:34 +01:00
parent 644ca76356
commit 6b7f03678e
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
SConstruct
View File

@ -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)