TheCloud/panda3d
1
0
Fork 0
mirror of https://github.com/panda3d/panda3d.git synced 2025-10-01 09:23:03 -04:00
Code Issues Packages Projects Releases Wiki Activity

Workaround to allow building the rtdist on Mac 10.11, which removes DYLD_LIBRARY_PATH

Browse Source
This commit is contained in:
rdb 2015-11-23 23:33:38 +01:00
parent 37509e7c93
commit 5ba93acf5c
1 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makepanda/makepandacore.py
View File

@ -2481,6 +2481,10 @@ def SetupBuildEnvironment(compiler):
dyldpath.insert(0, os.path.join(builtdir, 'lib'))
os.environ["DYLD_LIBRARY_PATH"] = os.pathsep.join(dyldpath)
# OS X 10.11 removed DYLD_LIBRARY_PATH, but we still need to pass
# on our lib directory to ppackage, so add it to PATH instead.
os.environ["PATH"] = os.path.join(builtdir, 'lib') + ':' + os.environ.get("PATH", "")
# Workaround around compile issue on PCBSD
if (os.path.exists("/usr/PCBSD")):
os.environ["LD_LIBRARY_PATH"] += os.pathsep + "/usr/PCBSD/local/lib"