Author: mattip>
Branch: win64-stage1
Changeset: r53977:47f38b0ee33e
Date: 2012-03-25 16:30 +0200
http://bitbucket.org/pypy/pypy/changeset/47f38b0ee33e/
Log: Backed out changeset: 0993bdbb1d59
diff --git a/pypy/rpython/tool/rffi_platform.py
b/pypy/rpython/tool/rffi_platform.py
--- a/pypy/rpython/tool/rffi_platform.py
+++ b/pypy/rpython/tool/rffi_platform.py
@@ -707,14 +707,14 @@
# ____________________________________________________________
-PYPY_EXTERNAL_DIR = os.path.abspath(os.path.join(pypydir,'../..'))
+PYPY_EXTERNAL_DIR = py.path.local(pypydir).join('..', '..')
# XXX make this configurable
if sys.platform == 'win32':
for libdir in [
- 'c:/buildslave/support', # on the bigboard buildbot
- 'd:/myslave', # on the snakepit buildbot
+ py.path.local('c:/buildslave/support'), # on the bigboard buildbot
+ py.path.local('d:/myslave'), # on the snakepit buildbot
]:
- if os.path.exists(libdir):
+ if libdir.check():
PYPY_EXTERNAL_DIR = libdir
break
@@ -759,7 +759,7 @@
if prefix and not os.path.isabs(prefix):
import glob
- entries = glob.glob(os.path.join(PYPY_EXTERNAL_DIR,'*'))
+ entries = glob.glob(str(PYPY_EXTERNAL_DIR.join(prefix + '*')))
if entries:
# Get last version
prefix = sorted(entries)[-1]
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
http://mail.python.org/mailman/listinfo/pypy-commit
