[6b7f036] master: 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

Jens Verwiebe noreply at git.blender.org
Mon Feb 10 14:56:00 CET 2014


Commit: 6b7f03678ec39a78c7b16800444b261de9af1a72
Author: Jens Verwiebe
Date:   Mon Feb 10 14:55:34 2014 +0100
https://developer.blender.org/rB6b7f03678ec39a78c7b16800444b261de9af1a72

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

===================================================================

M	SConstruct

===================================================================

diff --git a/SConstruct b/SConstruct
index ac5ee06..085c626 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)




More information about the Bf-blender-cvs mailing list