diff --git a/Doc/library/os.path.rst b/Doc/library/os.path.rst index dd67a7c7684..bc2220dd448 100644 --- a/Doc/library/os.path.rst +++ b/Doc/library/os.path.rst @@ -190,7 +190,7 @@ write files see :func:`open`, and for accessing the filesystem see the .. function:: normcase(path) - Normalize the case of a pathname. On Unix, this returns the path unchanged; on + Normalize the case of a pathname. On Unix and MacOSX, this returns the path unchanged; on case-insensitive filesystems, it converts the path to lowercase. On Windows, it also converts forward slashes to backward slashes. diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index c2cdb028cb8..d5da074cb44 100755 --- a/Mac/BuildScript/build-installer.py +++ b/Mac/BuildScript/build-installer.py @@ -649,6 +649,11 @@ def buildPython(): # several paths. version = getVersion() + # Since the extra libs are not in their installed framework location + # during the build, augment the library path so that the interpreter + # will find them during its extension import sanity checks. + os.environ['DYLD_LIBRARY_PATH'] = os.path.join(WORKDIR, + 'libraries', 'usr', 'local', 'lib') print "Running configure..." runCommand("%s -C --enable-framework --enable-universalsdk=%s " "--with-universal-archs=%s " @@ -670,6 +675,7 @@ def buildPython(): runCommand("make frameworkinstallextras DESTDIR=%s"%( shellQuote(rootDir))) + del os.environ['DYLD_LIBRARY_PATH'] print "Copying required shared libraries" if os.path.exists(os.path.join(WORKDIR, 'libraries', 'Library')): runCommand("mv %s/* %s"%(