[pypy-svn] r52662 - pypy/dist/ctypes_configure

[fijal at codespeak.net]

Author: fijal
Date: Mon Mar 17 20:13:26 2008
New Revision: 52662

Removed:
   pypy/dist/ctypes_configure/gcc_cache.py
Modified:
   pypy/dist/ctypes_configure/cbuild.py
   pypy/dist/ctypes_configure/configure.py
Log:
Remove caching.


Modified: pypy/dist/ctypes_configure/cbuild.py
==============================================================================
--- pypy/dist/ctypes_configure/cbuild.py	(original)
+++ pypy/dist/ctypes_configure/cbuild.py	Mon Mar 17 20:13:26 2008
@@ -1,6 +1,7 @@
 
 import os, sys, inspect, re, imp, py
 from ctypes_configure import stdoutcapture
+import distutils
 
 debug = 0
 
@@ -183,6 +184,16 @@
         opt += '/Op'
     gcv['OPT'] = opt
 
+
+def try_compile(c_files, eci):
+    try:
+        build_executable(c_files, eci)
+        result = True
+    except (distutils.errors.CompileError,
+            distutils.errors.LinkError):
+        result = False
+    return result
+
 def compile_c_module(cfiles, modbasename, eci, tmpdir=None):
     #try:
     #    from distutils.log import set_threshold
@@ -315,7 +326,8 @@
 
 def log_spawned_cmd(spawn):
     def spawn_and_log(cmd, *args, **kwds):
-        log.execute(' '.join(cmd))
+        if debug:
+            log.execute(' '.join(cmd))
         return spawn(cmd, *args, **kwds)
     return spawn_and_log
 

Modified: pypy/dist/ctypes_configure/configure.py
==============================================================================
--- pypy/dist/ctypes_configure/configure.py	(original)
+++ pypy/dist/ctypes_configure/configure.py	Mon Mar 17 20:13:26 2008
@@ -2,9 +2,8 @@
 
 import os, py, sys
 import ctypes
-from ctypes_configure.cbuild import build_executable, configdir
+from ctypes_configure.cbuild import build_executable, configdir, try_compile
 from ctypes_configure.cbuild import ExternalCompilationInfo
-from ctypes_configure.gcc_cache import build_executable_cache, try_compile_cache
 import distutils
 
 # ____________________________________________________________
@@ -149,7 +148,7 @@
         self.f.write(question + "\n")
         self.close()
         eci = self.config._compilation_info_
-        return try_compile_cache([self.path], eci)
+        return try_compile([self.path], eci)
 
         
 def configure(CConfig):