[pypy-commit] pypy default: hg merge

[hakanardo]

Author: Hakan Ardo <hakan at debian.org>
Branch: 
Changeset: r50545:ee80fd67c26a
Date: 2011-12-15 12:49 +0100
http://bitbucket.org/pypy/pypy/changeset/ee80fd67c26a/

Log:	hg merge

diff --git a/pypy/tool/gcc_cache.py b/pypy/tool/gcc_cache.py
--- a/pypy/tool/gcc_cache.py
+++ b/pypy/tool/gcc_cache.py
@@ -11,6 +11,9 @@
     # Import 'platform' every time, the compiler may have been changed
     from pypy.translator.platform import platform
     cache_dir = cache_dir_root.join(cachename).ensure(dir=1)
+    c_files.extend([py.path.local(f) for f in eci.separate_module_files])
+    eci = ExternalCompilationInfo(**eci._copy_attributes())
+    eci.separate_module_files = ()
     filecontents = [c_file.read() for c_file in c_files]
     key = repr((filecontents, eci, platform.key()))
     hash = md5(key).hexdigest()