From 621e6ca2a6c8900d0568c696415bf8a5b36d0757 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vedran=20Mileti=C4=87?= <rivanvx@gmail.com>
Date: Tue, 13 Nov 2012 14:24:27 +0100
Subject: [PATCH] Allow using CXX='distcc g++' with ./waf configure.

---
 wscript | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/wscript b/wscript
index 34f4661f5..39eb95883 100644
--- a/wscript
+++ b/wscript
@@ -341,9 +341,9 @@ def configure(conf):
         elif sys.platform == 'cygwin':
             env.append_value("LINKFLAGS", "-Wl,--enable-auto-import")
 
-        cxx, = env['CXX']
-
-        p = subprocess.Popen([cxx, '-print-file-name=libstdc++.so'], stdout=subprocess.PIPE)
+        cxx = env['CXX']
+        cxx_check_libstdcxx = cxx + ['stdout=subprocess.PIPE']
+        p = subprocess.Popen(cxx_check_libstdcxx, stdout=subprocess.PIPE)
         libstdcxx_location = os.path.dirname(p.stdout.read().strip())
         p.wait()
         if libstdcxx_location: