removing dl::extension

Replace with extensions array as at least with macos we need to check for .so and .dylib
AnyDSL · Dec 21, 2023 · 04e452c · 04e452c
1 parent e2495a3
commit 04e452c
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 10 deletions.
diff --git a/include/thorin/util/dl.h b/include/thorin/util/dl.h
@@ -5,7 +5,7 @@
 
 namespace thorin::dl {
 
-std::string_view extension(); ///< `".dll"` or `".so"`
+static constexpr auto extensions = {"dll", "dylib", "so"};
 
 void* open(const char* filename);
 void* get(void* handle, const char* symbol_name);

diff --git a/src/thorin/driver.cpp b/src/thorin/driver.cpp
@@ -11,7 +11,7 @@ namespace {
 std::vector<fs::path> get_plugin_name_variants(std::string_view name) {
     std::vector<fs::path> names;
     names.push_back(name); // if the user gives "libthorin_foo.so"
-    names.push_back(fmt("libthorin_{}{}", name, dl::extension()));
+    for (auto ext : dl::extensions) names.push_back(fmt("libthorin_{}.{}", name, ext));
     return names;
 }
 } // namespace

diff --git a/src/thorin/util/dl.cpp b/src/thorin/util/dl.cpp
@@ -14,14 +14,6 @@
 
 namespace thorin::dl {
 
-std::string_view extension() {
-#ifdef _WIN32
-    return ".dll";
-#else
-    return ".so";
-#endif
-}
-
 void* open(const char* file) {
 #ifdef _WIN32
     if (HMODULE handle = LoadLibraryA(file)) {