summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNed Deily <nad@acm.org>2012-02-03 01:45:05 (GMT)
committerNed Deily <nad@acm.org>2012-02-03 01:45:05 (GMT)
commitf9b0255db3bdb7519093be5a6d269ab5da2edcc0 (patch)
tree2681caa4e1024e576db38c5a572f42cfdbdf9626
parent538343d6ecfc5e0425230ba8198e3f5e3e17d134 (diff)
parentcf550dcff8eccac2745acbff2541be3b6405abe4 (diff)
downloadcpython-f9b0255db3bdb7519093be5a6d269ab5da2edcc0.zip
cpython-f9b0255db3bdb7519093be5a6d269ab5da2edcc0.tar.gz
cpython-f9b0255db3bdb7519093be5a6d269ab5da2edcc0.tar.bz2
merge
-rw-r--r--Lib/distutils/tests/support.py10
-rw-r--r--Misc/NEWS2
2 files changed, 10 insertions, 2 deletions
diff --git a/Lib/distutils/tests/support.py b/Lib/distutils/tests/support.py
index d77bbee..84d9232 100644
--- a/Lib/distutils/tests/support.py
+++ b/Lib/distutils/tests/support.py
@@ -188,6 +188,9 @@ def fixup_build_ext(cmd):
cmd = build_ext(dist)
support.fixup_build_ext(cmd)
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':
cmd.debug = sys.executable.endswith('_d.exe')
@@ -199,5 +202,8 @@ def fixup_build_ext(cmd):
if runshared is None:
cmd.library_dirs = ['.']
else:
- name, equals, value = runshared.partition('=')
- cmd.library_dirs = value.split(os.pathsep)
+ if sys.platform == 'darwin':
+ cmd.library_dirs = []
+ else:
+ name, equals, value = runshared.partition('=')
+ cmd.library_dirs = value.split(os.pathsep)
diff --git a/Misc/NEWS b/Misc/NEWS
index f00738b..68998e3 100644
--- a/Misc/NEWS
+++ b/Misc/NEWS
@@ -463,6 +463,8 @@ Core and Builtins
Library
-------
+- Issue #13901: Prevent test_distutils failures on OS X with --enable-shared.
+
- 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.