From 6b7f03678ec39a78c7b16800444b261de9af1a72 Mon Sep 17 00:00:00 2001 From: Jens Verwiebe Date: Mon, 10 Feb 2014 14:55:34 +0100 Subject: [PATCH] =?UTF-8?q?OSX/scons:=20fix=20breakage=20after=20clang-ope?= =?UTF-8?q?nmp=20commit:=20use=20the=20svn=20clang=20version=20instead=20o?= =?UTF-8?q?f=20Apple=20compiler=20naming,=20this=20also=20makes=20Brecht?= =?UTF-8?q?=E2=80=99s=20cycles=20sse/avx=20conditionals=20behave=20right?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SConstruct | 4 ++-- 1 file 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)