Backport fix for #10126

This commit is contained in:
Éric Araujo 2010-10-21 18:48:59 +00:00
parent 4cc5403527
commit e9df5d6866
1 changed files with 15 additions and 0 deletions

View File

@ -49,6 +49,20 @@ class BuildExtTestCase(support.TempdirManager,
sys.platform == 'cygwin') sys.platform == 'cygwin')
super(BuildExtTestCase, self).tearDown() super(BuildExtTestCase, self).tearDown()
def _fixup_command(self, cmd):
# When Python was build with --enable-shared, -L. is not good enough
# to find the libpython<blah>.so. This is because regrtest runs it
# under a tempdir, not in the top level where the .so lives. By the
# time we've gotten here, Python's already been chdir'd to the
# tempdir.
#
# To further add to the fun, we can't just add library_dirs to the
# Extension() instance because that doesn't get plumbed through to the
# final compiler command.
if not sys.platform.startswith('win'):
library_dir = sysconfig.get_config_var('srcdir')
cmd.library_dirs = [('.' if library_dir is None else library_dir)]
@unittest.skipIf(not os.path.exists(_XX_MODULE_PATH), @unittest.skipIf(not os.path.exists(_XX_MODULE_PATH),
'xxmodule.c not found') 'xxmodule.c not found')
def test_build_ext(self): def test_build_ext(self):
@ -58,6 +72,7 @@ class BuildExtTestCase(support.TempdirManager,
dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]}) dist = Distribution({'name': 'xx', 'ext_modules': [xx_ext]})
dist.package_dir = self.tmp_dir dist.package_dir = self.tmp_dir
cmd = build_ext(dist) cmd = build_ext(dist)
self._fixup_command(cmd)
if os.name == "nt": if os.name == "nt":
# On Windows, we must build a debug version iff running # On Windows, we must build a debug version iff running
# a debug build of Python # a debug build of Python