Merge pull request #2592 from peastman/dlopen

Fix error loading CPU PME on Mac

Merge pull request #2592 from peastman/dlopen
Fix error loading CPU PME on Mac
9ef98fd3 · peastman · GitHub · d510e164 · 219361da · 9ef98fd3
Unverified Commit 9ef98fd3 authored Mar 10, 2020 by peastman Committed by GitHub Mar 10, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

olla/src/Platform.cpp olla/src/Platform.cpp +4 -0

No files found.
--- a/olla/src/Platform.cpp
+++ b/olla/src/Platform.cpp
@@ -221,8 +221,12 @@ static void initializePlugins(vector<HMODULE>& plugins) {
 static void* loadOneLibrary(const string& file) {
 #ifdef __PNACL__
    throw OpenMMException("Loading dynamic libraries is not supported on PNaCl");
+#else
+#ifdef __APPLE__
+    void *handle = dlopen(file.c_str(), RTLD_LAZY | RTLD_GLOBAL);
 #else
    void *handle = dlopen(file.c_str(), RTLD_LAZY | RTLD_LOCAL);
+#endif
    if (handle == NULL) {
        throw OpenMMException("Error loading library "+file+": "+dlerror());
    }