traverseda
/
cpython
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

merge

This commit is contained in:
Ned Deily 2012-02-03 02:45:05 +01:00
parent 538343d6ec cf550dcff8
commit f9b0255db3
2 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Lib/distutils/tests/support.py
View File

@ -188,6 +188,9 @@ def fixup_build_ext(cmd):
cmd = build_ext(dist) cmd = build_ext(dist)
support.fixup_build_ext(cmd) support.fixup_build_ext(cmd)
cmd.ensure_finalized() cmd.ensure_finalized()
Unlike most other Unix platforms, Mac OS X embeds absolute paths
to shared libraries into executables, so the fixup is not needed there.
""" """
if os.name == 'nt': if os.name == 'nt':
cmd.debug = sys.executable.endswith('_d.exe') cmd.debug = sys.executable.endswith('_d.exe')
@ -198,6 +201,9 @@ def fixup_build_ext(cmd):
runshared = sysconfig.get_config_var('RUNSHARED') runshared = sysconfig.get_config_var('RUNSHARED')
if runshared is None: if runshared is None:
cmd.library_dirs = ['.'] cmd.library_dirs = ['.']
else:
if sys.platform == 'darwin':
cmd.library_dirs = []
else: else:
name, equals, value = runshared.partition('=') name, equals, value = runshared.partition('=')
cmd.library_dirs = value.split(os.pathsep) cmd.library_dirs = value.split(os.pathsep)

2
Misc/NEWS
View File

@ -463,6 +463,8 @@ Core and Builtins
Library Library
------- -------
- Issue #13901: Prevent test_distutils failures on OS X with --enable-shared.
- Issue #13676: Handle strings with embedded zeros correctly in sqlite3. - Issue #13676: Handle strings with embedded zeros correctly in sqlite3.
- Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell. - Issue #13506: Add '' to path for IDLE Shell when started and restarted with Restart Shell.