mirror of
https://github.com/MaskRay/ccls.git
synced 2025-04-02 15:02:19 +00:00
waf configure --use-system-clang, prefer bld.env.get_flat('CXX') over clang inferred from llvm-config'
Fixes #237. Credit to @acowley
This commit is contained in:
parent
acc8f42033
commit
a3a89af14f
8
wscript
8
wscript
@ -310,7 +310,13 @@ def build(bld):
|
|||||||
output = str(subprocess.check_output(
|
output = str(subprocess.check_output(
|
||||||
[bld.env['llvm_config'], '--bindir'],
|
[bld.env['llvm_config'], '--bindir'],
|
||||||
stderr=subprocess.STDOUT).decode()).strip()
|
stderr=subprocess.STDOUT).decode()).strip()
|
||||||
clang = os.path.join(output, 'clang')
|
|
||||||
|
# Use --check-cxx-compiler value if it is "clang".
|
||||||
|
# See https://github.com/jacobdufault/cquery/issues/237
|
||||||
|
clang = bld.env.get_flat('CXX')
|
||||||
|
if 'clang' not in clang:
|
||||||
|
clang = os.path.join(output, 'clang')
|
||||||
|
|
||||||
rpath = str(subprocess.check_output(
|
rpath = str(subprocess.check_output(
|
||||||
[bld.env['llvm_config'], '--libdir'],
|
[bld.env['llvm_config'], '--libdir'],
|
||||||
stderr=subprocess.STDOUT).decode()).strip()
|
stderr=subprocess.STDOUT).decode()).strip()
|
||||||
|
Loading…
Reference in New Issue
Block a user