Author: Alex Gaynor <[email protected]> Branch: Changeset: r56762:696efa49cce6 Date: 2012-08-19 19:18 -0500 http://bitbucket.org/pypy/pypy/changeset/696efa49cce6/
Log: merged upstream diff --git a/pypy/doc/windows.rst b/pypy/doc/windows.rst --- a/pypy/doc/windows.rst +++ b/pypy/doc/windows.rst @@ -135,6 +135,10 @@ the name of a valid gcc-derivative compiler, i.e. x86_64-w64-mingw32-gcc for the 64 bit compiler creating a 64 bit target. +You probably want to set the CPATH, LIBRARY_PATH, and PATH environment variable to +the header files, lib or dlls, and dlls respectively of the locally installed packages +if they are not in the mingw directory heirarchy. + libffi for the mingw compiler ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -175,7 +179,7 @@ Since hacking on Pypy means running tests, you will need a way to specify the mingw compiler when hacking (as opposed to translating). As of March 2012, --cc is not a valid option for pytest.py. However if you set an -environment variable CC it will allow you to choose a compiler. +environment variable CC to the compliter exe, testing will use it. .. _'mingw32 build': http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Automated%20Builds .. _`mingw64 build`: http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Automated%20Builds diff --git a/pypy/rlib/libffi.py b/pypy/rlib/libffi.py --- a/pypy/rlib/libffi.py +++ b/pypy/rlib/libffi.py @@ -1,3 +1,6 @@ +""" +This whole file is DEPRECATED. Use jit_libffi.py instead. +""" from __future__ import with_statement from pypy.rpython.lltypesystem import rffi, lltype _______________________________________________ pypy-commit mailing list [email protected] http://mail.python.org/mailman/listinfo/pypy-commit
