godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

SCons: Fix checks for clang in env['CXX'] 

They would match the whole path instead of only the filename.
This commit is contained in:
Rémi Verschelde 2018-09-25 11:15:25 +02:00
parent 298a6ad73c
commit 5adf7aa6b7
3 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
modules/webm/libvpx/SCsub
View File

@ -349,7 +349,7 @@ if webm_multithread:
env_libvpx.add_source_files(env.modules_sources, libvpx_sources_mt) env_libvpx.add_source_files(env.modules_sources, libvpx_sources_mt)
if webm_cpu_x86: if webm_cpu_x86:
is_clang_or_gcc = ('gcc' in env["CC"]) or ('clang' in env["CC"]) or ("OSXCROSS_ROOT" in os.environ) is_clang_or_gcc = ('gcc' in os.path.basename(env["CC"])) or ('clang' in os.path.basename(env["CC"])) or ("OSXCROSS_ROOT" in os.environ)
env_libvpx_mmx = env_libvpx.Clone() env_libvpx_mmx = env_libvpx.Clone()
if cpu_bits == '32' and is_clang_or_gcc: if cpu_bits == '32' and is_clang_or_gcc:

2
platform/server/detect.py
View File

@ -56,7 +56,7 @@ def configure(env):
## Compiler configuration ## Compiler configuration
if env['use_llvm']: if env['use_llvm']:
if ('clang++' not in env['CXX']): if ('clang++' not in os.path.basename(env['CXX'])):
env["CC"] = "clang" env["CC"] = "clang"
env["CXX"] = "clang++" env["CXX"] = "clang++"
env["LINK"] = "clang++" env["LINK"] = "clang++"

6
platform/x11/detect.py
View File

@ -86,7 +86,7 @@ def configure(env):
env.Prepend(CCFLAGS=['-O3', '-ffast-math']) env.Prepend(CCFLAGS=['-O3', '-ffast-math'])
else: #optimize for size else: #optimize for size
env.Prepend(CCFLAGS=['-Os']) env.Prepend(CCFLAGS=['-Os'])
if (env["debug_symbols"] == "yes"): if (env["debug_symbols"] == "yes"):
env.Prepend(CCFLAGS=['-g1']) env.Prepend(CCFLAGS=['-g1'])
if (env["debug_symbols"] == "full"): if (env["debug_symbols"] == "full"):
@ -115,12 +115,12 @@ def configure(env):
## Compiler configuration ## Compiler configuration
if 'CXX' in env and 'clang' in env['CXX']: if 'CXX' in env and 'clang' in os.path.basename(env['CXX']):
# Convenience check to enforce the use_llvm overrides when CXX is clang(++) # Convenience check to enforce the use_llvm overrides when CXX is clang(++)
env['use_llvm'] = True env['use_llvm'] = True
if env['use_llvm']: if env['use_llvm']:
if ('clang++' not in env['CXX']): if ('clang++' not in os.path.basename(env['CXX'])):
env["CC"] = "clang" env["CC"] = "clang"
env["CXX"] = "clang++" env["CXX"] = "clang++"
env["LINK"] = "clang++" env["LINK"] = "clang++"