summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorsambler <Develop@Shaneware.Biz>2015-01-27 20:40:17 +1030
committersambler <Develop@Shaneware.Biz>2015-01-27 20:40:17 +1030
commit8baa00a6e4b60eaef78fcfd34fe72725fd8ca060 (patch)
treeb998d22bac44fe9ab52f4f42fbf183fdaaf1d13b
parent67d357191ff74b2cfc80015941363a97e7ee19fd (diff)
Adjust x11/detect.py
Test if clang is defined in CC/CXX/LD - this allows a specific version of clang to be defined move appending -DTYPED_METHOD_BIND to keep clang options together move sanitize option out of use_llvm test, gcc48+ also supports sanitize=address
-rw-r--r--platform/x11/detect.py28
1 files changed, 11 insertions, 17 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 5171bc972d..fb5cdb5089 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -70,24 +70,23 @@ def configure(env):
else:
env["bits"]="32"
-
env.Append(CPPPATH=['#platform/x11'])
if (env["use_llvm"]=="yes"):
- env["CC"]="clang"
- env["CXX"]="clang++"
- env["LD"]="clang++"
- if (env["use_sanitizer"]=="yes"):
- env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
- env.Append(LINKFLAGS=['-fsanitize=address'])
- env.extra_suffix=".llvms"
- else:
- env.extra_suffix=".llvm"
+ if 'clang++' not in env['CXX']:
+ env["CC"]="clang"
+ env["CXX"]="clang++"
+ env["LD"]="clang++"
+ env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
+ env.extra_suffix=".llvm"
+
if (env["colored"]=="yes"):
if sys.stdout.isatty():
env.Append(CXXFLAGS=["-fcolor-diagnostics"])
-
-
+ if (env["use_sanitizer"]=="yes"):
+ env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer'])
+ env.Append(LINKFLAGS=['-fsanitize=address'])
+ env.extra_suffix+="s"
#if (env["tools"]=="no"):
# #no tools suffix
@@ -141,11 +140,6 @@ def configure(env):
env.Append(LINKFLAGS=['-m64','-L/usr/lib/i686-linux-gnu'])
- if (env["CXX"]=="clang++"):
- env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
- env["CC"]="clang"
- env["LD"]="clang++"
-
import methods
env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )