[pypy-svn] r66063 - pypy/branch/pyjitpl5/pypy/translator/tool

[arigo at codespeak.net]

Author: arigo
Date: Tue Jun 30 16:39:05 2009
New Revision: 66063

Added:
   pypy/branch/pyjitpl5/pypy/translator/tool/cbuild.py.merge.tmp
      - copied, changed from r66039, pypy/branch/pyjitpl5/pypy/translator/tool/cbuild.py
Log:
merging of svn+ssh://codespeak.net/svn/pypy/trunk/pypy/translator/tool/cbuild.py
revisions 62865 to 66039:

    ------------------------------------------------------------------------
    r63923 | getxsick | 2009-04-10 02:09:27 +0200 (Fri, 10 Apr 2009) | 1 line
    
    remove unused function and unnecessary import
    ------------------------------------------------------------------------
    r62871 | nshepperd | 2009-03-12 09:41:59 +0100 (Thu, 12 Mar 2009) | 3 lines
    
    Fix from_config_tool calling py.process.cmdexec with a list as cmd, 
    which changes semantics.
    
    ------------------------------------------------------------------------


Copied: pypy/branch/pyjitpl5/pypy/translator/tool/cbuild.py.merge.tmp (from r66039, pypy/branch/pyjitpl5/pypy/translator/tool/cbuild.py)
==============================================================================
--- pypy/branch/pyjitpl5/pypy/translator/tool/cbuild.py	(original)
+++ pypy/branch/pyjitpl5/pypy/translator/tool/cbuild.py.merge.tmp	Tue Jun 30 16:39:05 2009
@@ -153,9 +153,9 @@
             raise ImportError("cannot find %r" % (execonfigtool,))
             # we raise ImportError to be nice to the pypy.config.pypyoption
             # logic of skipping modules depending on non-installed libs
-        cflags = py.process.cmdexec([str(path), '--cflags'])
+        cflags = py.process.cmdexec('"%s" --cflags' % (str(path),))
         eci1 = cls.from_compiler_flags(cflags)
-        libs = py.process.cmdexec([str(path), '--libs'])
+        libs = py.process.cmdexec('"%s" --libs' % (str(path),))
         eci2 = cls.from_linker_flags(libs)
         return eci1.merge(eci2)
     from_config_tool = classmethod(from_config_tool)
@@ -285,24 +285,3 @@
         d['separate_module_files'] = ()
         d['separate_module_sources'] = ()
         return ExternalCompilationInfo(**d)
-
-def check_under_under_thread():
-    xxx
-    from pypy.tool.udir import udir
-    cfile = py.path.local(autopath.this_dir).join('__thread_test.c')
-    fsource = cfile.open('r')
-    source = fsource.read()
-    fsource.close()
-    cfile = udir.join('__thread_test.c')
-    fsource = cfile.open('w')
-    fsource.write(source)
-    fsource.close()
-    try:
-       exe = build_executable([str(cfile)], ExternalCompilationInfo(),
-                              noerr=True)
-       py.process.cmdexec(exe)
-    except (CompilationError,
-            py.error.Error):
-        return False
-    else:
-        return True