[pypy-svn] r57652 - pypy/branch/typeobject-init/pypy/translator/tool

arigo at codespeak.net arigo at codespeak.net
Wed Aug 27 17:36:03 CEST 2008


Author: arigo
Date: Wed Aug 27 17:36:01 2008
New Revision: 57652

Modified:
   pypy/branch/typeobject-init/pypy/translator/tool/cbuild.py
Log:
Revert r57623 (i.e. merge r57645 from trunk).


Modified: pypy/branch/typeobject-init/pypy/translator/tool/cbuild.py
==============================================================================
--- pypy/branch/typeobject-init/pypy/translator/tool/cbuild.py	(original)
+++ pypy/branch/typeobject-init/pypy/translator/tool/cbuild.py	Wed Aug 27 17:36:01 2008
@@ -633,10 +633,9 @@
 
             old = cfile.dirpath().chdir()
             try:
-                res = compiler.compile([str(cfile)],
+                res = compiler.compile([cfile.basename],
                                        include_dirs=self.eci.include_dirs,
-                                       extra_preargs=compile_extra,
-                                       output_dir=str(cfile.dirpath()))
+                                       extra_preargs=compile_extra)
                 assert len(res) == 1
                 cobjfile = py.path.local(res[0])
                 assert cobjfile.check()



More information about the Pypy-commit mailing list