Author: Armin Rigo <[email protected]>
Branch:
Changeset: r80708:d07751828864
Date: 2015-11-16 12:11 +0100
http://bitbucket.org/pypy/pypy/changeset/d07751828864/
Log: Use $RPYDIR in more places in the Makefile
diff --git a/rpython/translator/platform/posix.py
b/rpython/translator/platform/posix.py
--- a/rpython/translator/platform/posix.py
+++ b/rpython/translator/platform/posix.py
@@ -138,6 +138,13 @@
rel = lpath.relto(rpypath)
if rel:
return os.path.join('$(RPYDIR)', rel)
+ # Hack: also relativize from the path '$RPYDIR/..'.
+ # Otherwise, when translating pypy, we get the paths in
+ # pypy/module/* that are kept as absolute, which makes the
+ # whole purpose of $RPYDIR rather pointless.
+ rel = lpath.relto(rpypath.join('..'))
+ if rel:
+ return os.path.join('$(RPYDIR)', '..', rel)
m_dir = m.makefile_dir
if m_dir == lpath:
return '.'
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
