From 5ba93acf5cd6b1af0e8a6d67010dbc932c1291bd Mon Sep 17 00:00:00 2001 From: rdb Date: Mon, 23 Nov 2015 23:33:38 +0100 Subject: [PATCH] Workaround to allow building the rtdist on Mac 10.11, which removes DYLD_LIBRARY_PATH --- makepanda/makepandacore.py | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index c766dc946b..95af98b493 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -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"