For non-debug DLL builds avoid linking to CRT library as it is not neededfixpatches

Now when dlfcn.c does not call any function from CRT library, it is not
needed to link dlfcn library with some specific CRT library (e.g.
crtdll.dll, msvcrt.dll, msvcr120.dll or api-ms-win-crt-*.dll) and therefore
bound the dlfcn DLL library to specific Visual C++ runtime version.

This makes libdl.dll DLL library CRT-neutral and therefore can be used or
linked into any EXE application using any CRT library of any version,
without any Visual C++ runtime version conflict.

3 files changed, 20 insertions, 1 deletions

diff --git a/Makefile b/Makefile
index 899334a..a8a3e65 100644
--- a/Makefile
+++ b/Makefile
@@ -32,7 +32,7 @@ libdl.a: $(SOURCES)
         $(RANLIB) $@

 

 libdl.dll: $(SOURCES)

-        $(CC) $(CFLAGS) $(SHFLAGS) -DDLFCN_WIN32_SHARED -shared -o $@ $^

+        $(CC) $(CFLAGS) $(SHFLAGS) -DDLFCN_WIN32_SHARED -DDLFCN_WIN32_SHARED_ENTRYPOINT -D_DllMainCRTStartup=DllMainCRTStartup -nostartfiles -nostdlib -shared -o $@ $^ -lkernel32

 

 libdl.lib: libdl.dll

         $(LIBCMD) /machine:i386 /def:libdl.def

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 9066e65..2fbf0d9 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -15,6 +15,14 @@ set_target_properties(dl PROPERTIES DEFINE_SYMBOL "")
 
 # set shared mode for compiling library and propagate mode to cmake clients
 if (BUILD_SHARED_LIBS)
+    # for non-debug shared mode, avoid linking to CRT library as it is not needed
+    if (MSVC)
+        set_property(TARGET dl APPEND PROPERTY COMPILE_OPTIONS $<$<NOT:$<CONFIG:Debug>>:/Zl /GS->)
+    else (MSVC)
+        set_property(TARGET dl APPEND PROPERTY COMPILE_DEFINITIONS $<$<NOT:$<CONFIG:Debug>>:_DllMainCRTStartup=DllMainCRTStartup>)
+        set_property(TARGET dl APPEND PROPERTY LINK_OPTIONS $<$<NOT:$<CONFIG:Debug>>:-nostartfiles -nostdlib -lkernel32>)
+    endif (MSVC)
+    set_property(TARGET dl APPEND PROPERTY COMPILE_DEFINITIONS $<$<NOT:$<CONFIG:Debug>>:DLFCN_WIN32_SHARED_ENTRYPOINT>)
     target_compile_definitions(dl PUBLIC DLFCN_WIN32_SHARED)
 endif (BUILD_SHARED_LIBS)
 
diff --git a/src/dlfcn.c b/src/dlfcn.c
index c128579..a9c9d8b 100644
--- a/src/dlfcn.c
+++ b/src/dlfcn.c
@@ -955,4 +955,15 @@ BOOL WINAPI DllMain( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )
     (void) lpvReserved;

     return TRUE;

 }

+

+/* When requested defines DLL entry point which avoids using CRT library */

+#ifdef DLFCN_WIN32_SHARED_ENTRYPOINT

+#ifdef __cplusplus

+extern "C"

+#endif

+BOOL WINAPI _DllMainCRTStartup( HINSTANCE hinstDLL, DWORD fdwReason, LPVOID lpvReserved )

+{

+    return DllMain( hinstDLL, fdwReason, lpvReserved );

+}

+#endif

 #endif