summaryrefslogtreecommitdiff
path: root/platform/x11
diff options
context:
space:
mode:
authorRémi Verschelde <rverschelde@gmail.com>2018-09-25 11:15:25 +0200
committerRémi Verschelde <rverschelde@gmail.com>2018-09-25 11:15:25 +0200
commit5adf7aa6b75d1ab566f4bd68c4dec3ca7c188306 (patch)
tree657fa8a1bcbb6cfd82ddd7cd7e2a3bc4a5a825c7 /platform/x11
parent298a6ad73c660f616a24ddcf87a2f66b650537c8 (diff)
SCons: Fix checks for clang in env['CXX']
They would match the whole path instead of only the filename.
Diffstat (limited to 'platform/x11')
-rw-r--r--platform/x11/detect.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/platform/x11/detect.py b/platform/x11/detect.py
index 6a7a426804..905546e724 100644
--- a/platform/x11/detect.py
+++ b/platform/x11/detect.py
@@ -86,7 +86,7 @@ def configure(env):
env.Prepend(CCFLAGS=['-O3', '-ffast-math'])
else: #optimize for size
env.Prepend(CCFLAGS=['-Os'])
-
+
if (env["debug_symbols"] == "yes"):
env.Prepend(CCFLAGS=['-g1'])
if (env["debug_symbols"] == "full"):
@@ -115,12 +115,12 @@ def configure(env):
## 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(++)
env['use_llvm'] = True
if env['use_llvm']:
- if ('clang++' not in env['CXX']):
+ if ('clang++' not in os.path.basename(env['CXX'])):
env["CC"] = "clang"
env["CXX"] = "clang++"
env["LINK"] = "clang++"