Adapt to latest scons Version

[senf.git] / senfscons / CompileCheck.py

diff --git a/senfscons/CompileCheck.py b/senfscons/CompileCheck.py
index 34d3617..95358a1 100644 (file)
--- a/senfscons/CompileCheck.py
+++ b/senfscons/CompileCheck.py
@@ -1,4 +1,5 @@
 import os, os.path, sys
+import tempfile
 from SCons.Script import *
 import SCons.Scanner.C
 
@@ -14,13 +15,19 @@ def scanTests(f):
         elif line.startswith('}') and name and start:
             tests[name] = (start, linenr)
     return tests
-            
+
 def CompileCheck(target, source, env):
     tests = scanTests(file(source[0].abspath))
-    errf = os.popen(env.subst('$CXXCOM -DCOMPILE_CHECK 2>&1', source=source, target=target))
+    cenv = env.Clone()
+    cenv.Append( CPPDEFINES = { 'COMPILE_CHECK': '' } )
+    out = tempfile.TemporaryFile()
+    cenv['SPAWN'] = lambda sh, escape, cmd, args, env, pspawn=cenv['PSPAWN'], out=out: \
+                    pspawn(sh, escape, cmd, args, env, out, out)
+    Action('$CXXCOM').execute(target, source, cenv)
     passedTests = {}
     delay_name = None
-    for error in errf:
+    out.seek(0)
+    for error in out.read().splitlines():
         elts = error.split(':',2)
         if len(elts) != 3 : continue
         filename, line, message = elts