Author: Philip Jenvey <[email protected]>
Branch: py3k
Changeset: r63703:8cf10874388f
Date: 2013-04-27 13:03 -0700
http://bitbucket.org/pypy/pypy/changeset/8cf10874388f/
Log: merge default
diff --git a/rpython/translator/platform/__init__.py
b/rpython/translator/platform/__init__.py
--- a/rpython/translator/platform/__init__.py
+++ b/rpython/translator/platform/__init__.py
@@ -4,6 +4,7 @@
from rpython.tool.runsubprocess import run_subprocess as _run_subprocess
from rpython.tool.udir import udir
+from rpython.tool.version import rpythonroot
log = py.log.Producer("platform")
@@ -164,11 +165,11 @@
return response_file
def _make_o_file(self, cfile, ext):
- """Create a .o filename under the udir for a .c file"""
- oname = cfile.new(ext=ext)
- if oname.relto(udir):
- return oname
- ofile = udir.join(oname.relto(py.path.local()))
+ """Create an object file name under the udir for a .c file"""
+ ofile = cfile.new(ext=ext)
+ if ofile.relto(udir):
+ return ofile
+ ofile = udir.join(ofile.relto(rpythonroot))
ofile.dirpath().ensure(dir=True)
return ofile
_______________________________________________
pypy-commit mailing list
[email protected]
http://mail.python.org/mailman/listinfo/pypy-commit
