Author: Armin Rigo <[email protected]>
Branch: release-1.5
Changeset: r2630:e877261953bc
Date: 2016-02-13 10:29 +0100
http://bitbucket.org/cffi/cffi/changeset/e877261953bc/
Log: hg merge default
diff --git a/cffi/api.py b/cffi/api.py
--- a/cffi/api.py
+++ b/cffi/api.py
@@ -551,8 +551,10 @@
#
if '__pypy__' in sys.builtin_module_names:
if sys.platform == "win32":
- # we need 'libpypy-c.lib' (included with recent pypy distrib)
- # in addition to the runtime 'libpypy-c.dll'
+ # 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"
if hasattr(sys, 'prefix'):
ensure('library_dirs', sys.prefix)
diff --git a/testing/embedding/test_basic.py b/testing/embedding/test_basic.py
--- a/testing/embedding/test_basic.py
+++ b/testing/embedding/test_basic.py
@@ -100,6 +100,7 @@
c = distutils.ccompiler.new_compiler()
print('compiling %s with %r' % (name, modules))
extra_preargs = []
+ debug = True
if sys.platform == 'win32':
libfiles = []
for m in modules:
@@ -108,9 +109,12 @@
libfiles.append('Release\\%s.lib' % m[:-4])
modules = libfiles
extra_preargs.append('/MANIFEST')
+ debug = False # you need to install extra stuff
+ # for this to work
elif threads:
extra_preargs.append('-pthread')
- objects = c.compile([filename], macros=sorted(defines.items()),
debug=True)
+ objects = c.compile([filename], macros=sorted(defines.items()),
+ debug=debug)
c.link_executable(objects + modules, name,
extra_preargs=extra_preargs)
finally:
os.chdir(curdir)
_______________________________________________
pypy-commit mailing list
[email protected]
https://mail.python.org/mailman/listinfo/pypy-commit
