From: Kamil Rytarowski Date: Fri, 22 Jan 2016 15:16:21 +0000 (+0100) Subject: NetBSD: Don't link with -ldl for dlopen(3) on NetBSD X-Git-Tag: accepted/tizen/base/20180629.140029~5778^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=6a552280632a087ce3724a2c7329405ed1369b14;p=platform%2Fupstream%2Fcoreclr.git NetBSD: Don't link with -ldl for dlopen(3) on NetBSD NAME dlopen, dlclose, dlsym, dlvsym, dladdr, dlctl, dlerror - dynamic link interface LIBRARY (These functions are not in a library. They are included in every dynamically linked program automatically.) SYNOPSIS #include void * dlopen(const char *path, int mode); --- diff --git a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt index ec5f0e7..f4840ed 100644 --- a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt +++ b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt @@ -12,12 +12,12 @@ add_executable(coreconsole ${CORECONSOLE_SOURCES} ) -# FreeBSD implements dlopen in libc -if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) +# FreeBSD and NetBSD implement dlopen(3) in libc +if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) target_link_libraries(coreconsole dl ) -endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) +endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) # Libc turns locks into no-ops if pthread was not loaded into process yet. Loading # pthread by the process executable ensures that all locks are initialized properly. diff --git a/src/coreclr/hosts/unixcorerun/CMakeLists.txt b/src/coreclr/hosts/unixcorerun/CMakeLists.txt index 48da17c..4563ba9 100644 --- a/src/coreclr/hosts/unixcorerun/CMakeLists.txt +++ b/src/coreclr/hosts/unixcorerun/CMakeLists.txt @@ -12,12 +12,12 @@ add_executable(corerun ${CORERUN_SOURCES} ) -# FreeBSD implements dlopen in libc -if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) +# FreeBSD and NetBSD implement dlopen(3) in libc +if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) target_link_libraries(corerun dl ) -endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) +endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) # Libc turns locks into no-ops if pthread was not loaded into process yet. Loading # pthread by the process executable ensures that all locks are initialized properly. diff --git a/src/ilasm/CMakeLists.txt b/src/ilasm/CMakeLists.txt index 5e82cd2..4c5a7f6 100644 --- a/src/ilasm/CMakeLists.txt +++ b/src/ilasm/CMakeLists.txt @@ -60,12 +60,12 @@ if(CLR_CMAKE_PLATFORM_UNIX) palrt ) - # FreeBSD implements dlopen in libc - if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + # FreeBSD and NetBSD implement dlopen(3) in libc + if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) target_link_libraries(ilasm dl ) - endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) else() target_link_libraries(ilasm diff --git a/src/ildasm/exe/CMakeLists.txt b/src/ildasm/exe/CMakeLists.txt index 7d86bf4..8a57044 100644 --- a/src/ildasm/exe/CMakeLists.txt +++ b/src/ildasm/exe/CMakeLists.txt @@ -54,12 +54,12 @@ if(CLR_CMAKE_PLATFORM_UNIX) palrt ) - # FreeBSD implements dlopen in libc - if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + # FreeBSD and NetBSD implement dlopen(3) in libc + if(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) target_link_libraries(ildasm dl ) - endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + endif(NOT CMAKE_SYSTEM_NAME STREQUAL FreeBSD AND NOT CMAKE_SYSTEM_NAME STREQUAL NetBSD) else() target_link_libraries(ildasm ${ILDASM_LINK_LIBRARIES}