asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust x11/detect.py

Browse source 
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
This commit is contained in:
sambler 2015-01-27 20:40:17 +10:30
parent 67d357191f
commit 8baa00a6e4
1 changed files with 11 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
platform/x11/detect.py
View file

@ -70,24 +70,23 @@ def configure(env):
else: else:
env["bits"]="32" env["bits"]="32"
env.Append(CPPPATH=['#platform/x11']) env.Append(CPPPATH=['#platform/x11'])
if (env["use_llvm"]=="yes"): if (env["use_llvm"]=="yes"):
env["CC"]="clang" if 'clang++' not in env['CXX']:
env["CXX"]="clang++" env["CC"]="clang"
env["LD"]="clang++" env["CXX"]="clang++"
if (env["use_sanitizer"]=="yes"): env["LD"]="clang++"
env.Append(CXXFLAGS=['-fsanitize=address','-fno-omit-frame-pointer']) env.Append(CPPFLAGS=['-DTYPED_METHOD_BIND'])
env.Append(LINKFLAGS=['-fsanitize=address']) env.extra_suffix=".llvm"
env.extra_suffix=".llvms"
else:
env.extra_suffix=".llvm"
if (env["colored"]=="yes"): if (env["colored"]=="yes"):
if sys.stdout.isatty(): if sys.stdout.isatty():
env.Append(CXXFLAGS=["-fcolor-diagnostics"]) 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"): #if (env["tools"]=="no"):
# #no tools suffix # #no tools suffix
@ -141,11 +140,6 @@ def configure(env):
env.Append(LINKFLAGS=['-m64','-L/usr/lib/i686-linux-gnu']) 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 import methods
env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } ) env.Append( BUILDERS = { 'GLSL120' : env.Builder(action = methods.build_legacygl_headers, suffix = 'glsl.h',src_suffix = '.glsl') } )