|
|
|
@ -80,10 +80,6 @@ static inline void* GetDsoHandleFromDefaultPath(const std::string& dso_path,
|
|
|
|
|
// default search from LD_LIBRARY_PATH/DYLD_LIBRARY_PATH
|
|
|
|
|
// and /usr/local/lib path
|
|
|
|
|
void* dso_handle = dlopen(dso_path.c_str(), dynload_flags);
|
|
|
|
|
if (nullptr == dso_handle) {
|
|
|
|
|
dso_handle =
|
|
|
|
|
dlopen(join("/usr/local/lib/", dso_path).c_str(), dynload_flags);
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
// DYLD_LIBRARY_PATH is disabled after Mac OS 10.11 to
|
|
|
|
|
// bring System Integrity Projection (SIP), if dso_handle
|
|
|
|
@ -106,7 +102,7 @@ static inline void* GetDsoHandleFromDefaultPath(const std::string& dso_path,
|
|
|
|
|
|
|
|
|
|
if (nullptr == dso_handle) {
|
|
|
|
|
LOG(WARNING) << "Can not find library: " << dso_path
|
|
|
|
|
<< ". Please try to set add the lib path to LD_LIBRARY_PATH.";
|
|
|
|
|
<< ". Please try to add the lib path to LD_LIBRARY_PATH.";
|
|
|
|
|
}
|
|
|
|
|
return dso_handle;
|
|
|
|
|
}
|
|
|
|
|