Author: Matti Picus <matti.pi...@gmail.com>
Branch:
Changeset: r70970:3b9b82ae5747
Date: 2014-04-25 11:33 +0300
http://bitbucket.org/pypy/pypy/changeset/3b9b82ae5747/
Log: respect PYPY_LOCALBASE in windows
diff --git a/rpython/translator/platform/test/test_posix.py
b/rpython/translator/platform/test/test_posix.py
--- a/rpython/translator/platform/test/test_posix.py
+++ b/rpython/translator/platform/test/test_posix.py
@@ -56,8 +56,13 @@
finally:
del os.environ['PYPY_LOCALBASE']
Makefile = tmpdir.join('Makefile').read()
- assert 'INCLUDEDIRS = -I/foo/baz/include' in Makefile
- assert 'LIBDIRS = -L/foo/baz/lib' in Makefile
+ include_prefix = '-I'
+ lib_prefix = '-L'
+ if self.platform.name == 'msvc':
+ include_prefix = '/I'
+ lib_prefix = '/LIBPATH:'
+ assert 'INCLUDEDIRS = %s/foo/baz/include' % include_prefix in Makefile
+ assert 'LIBDIRS = %s/foo/baz/lib' % lib_prefix in Makefile
class TestMaemo(TestMakefile):
strict_on_stderr = False
diff --git a/rpython/translator/platform/windows.py
b/rpython/translator/platform/windows.py
--- a/rpython/translator/platform/windows.py
+++ b/rpython/translator/platform/windows.py
@@ -292,7 +292,10 @@
rel_ofiles = [rel_cfile[:rel_cfile.rfind('.')]+'.obj' for rel_cfile in
rel_cfiles]
m.cfiles = rel_cfiles
- rel_includedirs = [rpyrel(incldir) for incldir in eci.include_dirs]
+ rel_includedirs = [rpyrel(incldir) for incldir in
+ self.preprocess_include_dirs(eci.include_dirs)]
+ rel_libdirs = [rpyrel(libdir) for libdir in
+ self.preprocess_library_dirs(eci.library_dirs)]
m.comment('automatically generated makefile')
definitions = [
@@ -302,7 +305,7 @@
('SOURCES', rel_cfiles),
('OBJECTS', rel_ofiles),
('LIBS', self._libs(eci.libraries)),
- ('LIBDIRS', self._libdirs(eci.library_dirs)),
+ ('LIBDIRS', self._libdirs(rel_libdirs)),
('INCLUDEDIRS', self._includedirs(rel_includedirs)),
('CFLAGS', self.cflags),
('CFLAGSEXTRA', list(eci.compile_extra)),
_______________________________________________
pypy-commit mailing list
pypy-commit@python.org
https://mail.python.org/mailman/listinfo/pypy-commit
