Zengtudor/ccls
1
0
Fork 0
mirror of https://github.com/MaskRay/ccls.git synced 2025-04-03 23:42:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

waf configure --use-system-clang, prefer bld.env.get_flat('CXX') over clang inferred from llvm-config'

Browse Source 
Fixes #237. Credit to @acowley
This commit is contained in:
Fangrui Song 2018-01-07 22:08:43 -08:00
parent acc8f42033
commit a3a89af14f
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
wscript
View File

@ -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()