Changed target specific libraries from SHARED to MODULE to fix issue …

…with OSX building them as .dylib Removed alternate shared library .dylib workaround Signed-off-by: Alex M. Wells <[email protected]>
AcademySoftwareFoundation · Mar 12, 2021 · 7806355 · 7806355
1 parent 0fdfb4a
commit 7806355
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 13 deletions.
diff --git a/src/liboslexec/CMakeLists.txt b/src/liboslexec/CMakeLists.txt
@@ -360,13 +360,13 @@ set (_b16_AVX512_noFMA_oslexec_lib _b16_AVX512_noFMA_oslexec)
 set (_b8_AVX512_noFMA_oslexec_lib _b8_AVX512_noFMA_oslexec)
 set (_b8_AVX2_noFMA_oslexec_lib _b8_AVX2_noFMA_oslexec)
 
-add_library ( ${_b16_AVX512_oslexec_lib} SHARED "${TARGET_SOURCES_B16_AVX512}" )
-add_library ( ${_b8_AVX512_oslexec_lib} SHARED "${TARGET_SOURCES_B8_AVX512}" )
-add_library ( ${_b8_AVX2_oslexec_lib} SHARED "${TARGET_SOURCES_B8_AVX2}" )
-add_library ( ${_b8_AVX_oslexec_lib} SHARED "${TARGET_SOURCES_B8_AVX}" )
-#add_library ( ${_b16_AVX512_noFMA_oslexec_lib} SHARED "${TARGET_SOURCES_B16_AVX512_NOFMA}" )
-#add_library ( ${_b8_AVX512_noFMA_oslexec_lib} SHARED "${TARGET_SOURCES_B8_AVX512_NOFMA}" )
-#add_library ( ${_b8_AVX2_noFMA_oslexec_lib} SHARED "${TARGET_SOURCES_B8_AVX2_NOFMA}" )
+add_library ( ${_b16_AVX512_oslexec_lib} MODULE "${TARGET_SOURCES_B16_AVX512}" )
+add_library ( ${_b8_AVX512_oslexec_lib} MODULE "${TARGET_SOURCES_B8_AVX512}" )
+add_library ( ${_b8_AVX2_oslexec_lib} MODULE "${TARGET_SOURCES_B8_AVX2}" )
+add_library ( ${_b8_AVX_oslexec_lib} MODULE "${TARGET_SOURCES_B8_AVX}" )
+#add_library ( ${_b16_AVX512_noFMA_oslexec_lib} MODULE "${TARGET_SOURCES_B16_AVX512_NOFMA}" )
+#add_library ( ${_b8_AVX512_noFMA_oslexec_lib} MODULE "${TARGET_SOURCES_B8_AVX512_NOFMA}" )
+#add_library ( ${_b8_AVX2_noFMA_oslexec_lib} MODULE "${TARGET_SOURCES_B8_AVX2_NOFMA}" )
 
 set ( liboslexec_target_libs
     ${_b16_AVX512_oslexec_lib}

diff --git a/src/liboslexec/batched_llvm_instance.cpp b/src/liboslexec/batched_llvm_instance.cpp
@@ -233,12 +233,7 @@ init_wide_function_map(const ConcreteT&, ShadingSystemImpl& shadingsys)
     if (is_initialized)
         return;
 
-    const char* shared_lib_ext =
-#if OSL_APPLE_CLANG_VERSION
-        "dylib";
-#else
-        OIIO::Plugin::plugin_extension();
-#endif
+    const char* shared_lib_ext = OIIO::Plugin::plugin_extension();
     std::string shared_lib_name = std::string("lib_")
                                   + ConcreteT::library_selector_string
                                   + "oslexec." + shared_lib_ext;