From 6bdddc4134898be19c1117d8b63be49446269ce5 Mon Sep 17 00:00:00 2001 From: Armin Rigo Date: Mon, 15 Feb 2016 10:30:55 +0100 Subject: pypy on windows now stores "python27.lib" in a directory "libs" --- cffi/api.py | 10 ++++------ 1 file changed, 4 insertions(+), 6 deletions(-) (limited to 'cffi/api.py') diff --git a/cffi/api.py b/cffi/api.py index 7fc3880..70ef93a 100644 --- a/cffi/api.py +++ b/cffi/api.py @@ -551,13 +551,11 @@ class FFI(object): # if '__pypy__' in sys.builtin_module_names: if sys.platform == "win32": - # we need 'libpypy-c.lib'. Right now, distributions of - # pypy contain it as 'include/python27.lib'. You need - # to manually copy it back to 'libpypy-c.lib'. XXX Will - # be fixed in the next pypy release. - pythonlib = "libpypy-c" + # we need 'libpypy-c.lib'. Current distributions of + # pypy (>= 4.1) contain it as 'libs/python27.lib'. + pythonlib = "python27" if hasattr(sys, 'prefix'): - ensure('library_dirs', sys.prefix) + ensure('library_dirs', os.path.join(sys.prefix, 'libs')) else: # we need 'libpypy-c.{so,dylib}', which should be by # default located in 'sys.prefix/bin' -- cgit v1.2.1