diff --git a/makepanda/makepandacore.py b/makepanda/makepandacore.py index 9b836eeab1..56fd1fd130 100644 --- a/makepanda/makepandacore.py +++ b/makepanda/makepandacore.py @@ -911,8 +911,11 @@ def GetLdCache(): lib = lib.split(".so", 1)[0][3:] LD_CACHE.append(lib) else: - for l in glob.glob("/lib/*.so*") + glob.glob("/usr/lib/*.so*") + glob.glob("/usr/local/lib/*.so*") + glob.glob("/usr/PCBSD/local/lib/*.so*"): - lib = os.path.basename(l).split(".so", 1)[0][3:] + libs = glob.glob("/lib/*.so*") + glob.glob("/usr/lib/*.so*") + glob.glob("/usr/local/lib/*.so*") + glob.glob("/usr/PCBSD/local/lib/*.so*") + if (sys.platform == "darwin"): + libs += glob.glob("/lib/*.dylib*") + glob.glob("/usr/lib/*.dylib*") + glob.glob("/usr/local/lib/*.dylib*") + for l in libs: + lib = os.path.basename(l).split(".so", 1)[0].split(".dylib", 1)[0][3:] LD_CACHE.append(lib) # Now check for static libraries - they aren't found by ldconfig. for l in glob.glob("/lib/*.a") + glob.glob("/usr/lib/*.a") + glob.glob("/usr/local/lib/*.a") + glob.glob("/usr/PCBSD/local/lib/*.a"):