diff options
| author |   Matti Picus <matti.picus@gmail.com> | 2013-11-29 07:38:43 +0200 |
|---|---|---|
| committer | Matti Picus <matti.picus@gmail.com> | 2013-11-29 07:38:43 +0200 |
| commit | f57b25930729a5e5eeb3323aae0b032db8469a31 (patch) | |
| tree | 2f1b72108e0de1c7e7f8f66a0698928333d20957 /lib_pypy/_pypy_testcapi.py | |
| parent | Support the "General unicode category" pattern in rsre. (diff) | |
| download | pypy-f57b25930729a5e5eeb3323aae0b032db8469a31.tar.gz pypy-f57b25930729a5e5eeb3323aae0b032db8469a31.tar.bz2 pypy-f57b25930729a5e5eeb3323aae0b032db8469a31.zip | |
test, change the name of the windows import library created during translation,
fixes some failing lib-python nightly tests
Diffstat (limited to 'lib_pypy/_pypy_testcapi.py')
| -rw-r--r-- | lib_pypy/_pypy_testcapi.py | 13 |
1 files changed, 6 insertions, 7 deletions
diff --git a/lib_pypy/_pypy_testcapi.py b/lib_pypy/_pypy_testcapi.py index 44981bbc8f..dcc4bc2450 100644 --- a/lib_pypy/_pypy_testcapi.py +++ b/lib_pypy/_pypy_testcapi.py @@ -33,14 +33,13 @@ def compile_shared(csource, modulename): # set link options output_filename = modulename + _get_c_extension_suffix() if sys.platform == 'win32': - # XXX libpypy-c.lib is currently not installed automatically - library = os.path.join(thisdir, '..', 'include', 'libpypy-c') + # XXX pyconfig.h uses a pragma to link to the import library, + # which is currently python27.lib + library = os.path.join(thisdir, '..', 'include', 'python27') if not os.path.exists(library + '.lib'): - #For a nightly build - library = os.path.join(thisdir, '..', 'include', 'python27') - if not os.path.exists(library + '.lib'): - # For a local translation - library = os.path.join(thisdir, '..', 'pypy', 'goal', 'libpypy-c') + # For a local translation or nightly build + library = os.path.join(thisdir, '..', 'pypy', 'goal', 'python27') + assert os.path.exists(library + '.lib'),'Could not find import library "%s"' % library libraries = [library, 'oleaut32'] extra_ldargs = ['/MANIFEST', # needed for VC10 '/EXPORT:init' + modulename] |