diff options
author | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-30 20:04:12 (GMT) |
---|---|---|
committer | Ronald Oussoren <ronaldoussoren@mac.com> | 2009-03-30 20:04:12 (GMT) |
commit | 524e36a5d0d9ab811f4dabfa26fbde8564393927 (patch) | |
tree | 095236ac9f03b033be921acb9e3036d5e042a9f4 /Mac/BuildScript | |
parent | ed96036049412651ba1df5ae9333d618caaa5b5d (diff) | |
download | cpython-524e36a5d0d9ab811f4dabfa26fbde8564393927.zip cpython-524e36a5d0d9ab811f4dabfa26fbde8564393927.tar.gz cpython-524e36a5d0d9ab811f4dabfa26fbde8564393927.tar.bz2 |
Merged revisions 70746 via svnmerge from
svn+ssh://pythondev@svn.python.org/python/trunk
........
r70746 | ronald.oussoren | 2009-03-30 15:02:08 -0500 (Mon, 30 Mar 2009) | 2 lines
Fix for issue 13095
........
Diffstat (limited to 'Mac/BuildScript')
-rwxr-xr-x | Mac/BuildScript/build-installer.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Mac/BuildScript/build-installer.py b/Mac/BuildScript/build-installer.py index c2cdb02..d5da074 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"%( |