diff options
author | Jan Kotas <jkotas@microsoft.com> | 2016-01-23 06:43:21 -0800 |
---|---|---|
committer | Jan Kotas <jkotas@microsoft.com> | 2016-01-23 06:43:21 -0800 |
commit | 49f39af14e6e2d4048f3c74db0c5164c0f4131b5 (patch) | |
tree | 6ba32b59aa3c543ef225f6547e90d2fe280d09d3 /src | |
parent | 119f146b9e4c06a7c30a177cf8283af720aac706 (diff) | |
parent | 6a552280632a087ce3724a2c7329405ed1369b14 (diff) | |
download | coreclr-49f39af14e6e2d4048f3c74db0c5164c0f4131b5.tar.gz coreclr-49f39af14e6e2d4048f3c74db0c5164c0f4131b5.tar.bz2 coreclr-49f39af14e6e2d4048f3c74db0c5164c0f4131b5.zip |
Merge pull request #2802 from krytarowski/netbsd-support-9
NetBSD: Don't link with -ldl for dlopen(3) on NetBSD
Diffstat (limited to 'src')
-rw-r--r-- | src/coreclr/hosts/unixcoreconsole/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/coreclr/hosts/unixcorerun/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/ilasm/CMakeLists.txt | 6 | ||||
-rw-r--r-- | src/ildasm/exe/CMakeLists.txt | 6 |
4 files changed, 12 insertions, 12 deletions
diff --git a/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt b/src/coreclr/hosts/unixcoreconsole/CMakeLists.txt index ec5f0e7f6b..f4840edf38 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 48da17c9e0..4563ba9938 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 5e82cd2e11..4c5a7f63a9 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 7d86bf48c8..8a57044ce6 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} |