From 1f5843495730e14ef0f40dca604cc854076ac1c1 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 9 Mar 2014 13:33:40 +0200 Subject: A few clang fixes. --- environment.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/environment.py b/environment.py index dafb5a774..4b3337707 100644 --- a/environment.py +++ b/environment.py @@ -911,7 +911,7 @@ class Environment(): if (out.startswith('cc') or 'gcc' in out) and \ 'Free Software Foundation' in out: return GnuCCompiler(ccache + [compiler], version, GCC_STANDARD, is_cross, exe_wrap) - if (out.startswith('clang')): + if 'clang' in out: return ClangCCompiler(ccache + [compiler], version, is_cross, exe_wrap) if 'Microsoft' in out: # Visual Studio prints version number to stderr but @@ -969,7 +969,7 @@ class Environment(): return GnuCPPCompiler(ccache + [compiler], version, is_cross, exe_wrap) if 'apple' in out and 'Free Software Foundation' in out: return GnuCPPCompiler(ccache + [compiler], version, is_cross, exe_wrap) - if out.startswith('clang'): + if 'clang' in out: return ClangCPPCompiler(ccache + [compiler], version, is_cross, exe_wrap) if 'Microsoft' in out: version = re.search(Environment.version_regex, err).group() -- cgit v1.2.3 From 1e83db2ff3a5de8c6c6e9ac5665a202cd17a575d Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sun, 9 Mar 2014 14:47:09 +0200 Subject: Some clang fixes. --- environment.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/environment.py b/environment.py index 4b3337707..557b95d2b 100644 --- a/environment.py +++ b/environment.py @@ -600,6 +600,9 @@ class ClangCCompiler(CCompiler): def get_pch_suffix(self): return 'pch' + def build_rpath_args(self, build_dir, rpath_paths): + return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])] + class GnuCPPCompiler(CPPCompiler): std_warn_flags = ['-Wall', '-Winvalid-pch'] std_opt_flags = ['-O2'] @@ -648,6 +651,11 @@ class ClangCPPCompiler(CPPCompiler): def get_pch_suffix(self): return 'pch' + def build_rpath_args(self, build_dir, rpath_paths): + if len(rpath_paths) == 0: + return [] + return ['-Wl,-rpath,' + ':'.join([os.path.join(build_dir, p) for p in rpath_paths])] + class VisualStudioLinker(): always_flags = ['/NOLOGO'] def __init__(self, exelist): -- cgit v1.2.3