From a3a89af14f9bff47954fa5b5fded2f48936e9af8 Mon Sep 17 00:00:00 2001
From: Fangrui Song <i@maskray.me>
Date: Sun, 7 Jan 2018 22:08:43 -0800
Subject: [PATCH] waf configure --use-system-clang, prefer
 bld.env.get_flat('CXX') over clang inferred from llvm-config'

Fixes #237. Credit to @acowley
---
 wscript | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/wscript b/wscript
index 162989e5..e0164bb5 100644
--- a/wscript
+++ b/wscript
@@ -310,7 +310,13 @@ def build(bld):
       output = str(subprocess.check_output(
           [bld.env['llvm_config'], '--bindir'],
           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(
           [bld.env['llvm_config'], '--libdir'],
           stderr=subprocess.STDOUT).decode()).strip()