diff options
author | Kamil Rytarowski <n54@gmx.com> | 2016-02-14 04:31:57 +0100 |
---|---|---|
committer | Kamil Rytarowski <n54@gmx.com> | 2016-02-14 04:45:41 +0100 |
commit | 4e548e16efb02b6c97c10eb9fd3d49ac94245507 (patch) | |
tree | 3bfe833ef64af53bb0ff7f71abf155765717699c /src | |
parent | a1c870d555a73618a8ed9c2d26e523eb7e71ab36 (diff) | |
download | coreclr-4e548e16efb02b6c97c10eb9fd3d49ac94245507.tar.gz coreclr-4e548e16efb02b6c97c10eb9fd3d49ac94245507.tar.bz2 coreclr-4e548e16efb02b6c97c10eb9fd3d49ac94245507.zip |
Add more CMake sugar for NetBSD
This resolves 'gen-dactable-rva.sh does not print to dactablerva.h' #3168
This fixes issue with g_dacTable unavailable in libcoreclr.so.
This patch assumes GNU ld(1) on NetBSD
Thanks to Bruce Mitchener @waywardmonkeys for pointing out ld(1) nits.
Diffstat (limited to 'src')
-rw-r--r-- | src/dlls/dbgshim/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/dlls/mscordac/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/dlls/mscordbi/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/dlls/mscoree/coreclr/CMakeLists.txt | 4 | ||||
-rw-r--r-- | src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt | 9 |
5 files changed, 12 insertions, 13 deletions
diff --git a/src/dlls/dbgshim/CMakeLists.txt b/src/dlls/dbgshim/CMakeLists.txt index 491a0e1196..621ab134c7 100644 --- a/src/dlls/dbgshim/CMakeLists.txt +++ b/src/dlls/dbgshim/CMakeLists.txt @@ -24,11 +24,11 @@ if(CLR_CMAKE_PLATFORM_UNIX) add_compile_options(-fPIC) endif(CLR_CMAKE_PLATFORM_UNIX) -if(CLR_CMAKE_PLATFORM_LINUX) +if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD) # This option is necessary to ensure that the overloaded delete operator defined inside # of the utilcode will be used instead of the standard library delete operator. set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions") -endif(CLR_CMAKE_PLATFORM_LINUX) +endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD) add_library_clr(dbgshim SHARED ${DBGSHIM_SOURCES}) diff --git a/src/dlls/mscordac/CMakeLists.txt b/src/dlls/mscordac/CMakeLists.txt index 9066b05b89..40704401b4 100644 --- a/src/dlls/mscordac/CMakeLists.txt +++ b/src/dlls/mscordac/CMakeLists.txt @@ -30,7 +30,7 @@ if(WIN32) set(START_LIBRARY_GROUP) set(END_LIBRARY_GROUP) else(WIN32) - if(CLR_CMAKE_PLATFORM_LINUX) + if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD) # This option is necessary to ensure that the overloaded delete operator defined inside # of the utilcode will be used instead of the standard library delete operator. set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions") @@ -39,7 +39,7 @@ else(WIN32) # ensure proper resolving of circular references between a subset of the libraries. set(START_LIBRARY_GROUP -Wl,--start-group) set(END_LIBRARY_GROUP -Wl,--end-group) - endif(CLR_CMAKE_PLATFORM_LINUX) + endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD) endif(WIN32) add_library_clr(mscordaccore SHARED ${CLR_DAC_SOURCES}) diff --git a/src/dlls/mscordbi/CMakeLists.txt b/src/dlls/mscordbi/CMakeLists.txt index 74bc20624c..4470557e0d 100644 --- a/src/dlls/mscordbi/CMakeLists.txt +++ b/src/dlls/mscordbi/CMakeLists.txt @@ -65,11 +65,11 @@ if(WIN32) elseif(CLR_CMAKE_PLATFORM_UNIX) - if(CLR_CMAKE_PLATFORM_LINUX) + if(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD) # This option is necessary to ensure that the overloaded new/delete operators defined inside # of the utilcode will be used instead of the standard library delete operator. set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions") - endif(CLR_CMAKE_PLATFORM_LINUX) + endif(CLR_CMAKE_PLATFORM_LINUX OR CLR_CMAKE_PLATFORM_NETBSD) list(APPEND COREDBI_LIBRARIES mdhotdata_full diff --git a/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/dlls/mscoree/coreclr/CMakeLists.txt index 0901404913..1b7d1fe073 100644 --- a/src/dlls/mscoree/coreclr/CMakeLists.txt +++ b/src/dlls/mscoree/coreclr/CMakeLists.txt @@ -15,7 +15,7 @@ else() set(EXPORTS_FILE ${CMAKE_CURRENT_BINARY_DIR}/coreclr.exports) generate_exports_file(${DEF_SOURCES} ${EXPORTS_FILE}) - if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD) # This option is necessary to ensure that the overloaded delete operator defined inside # of the utilcode will be used instead of the standard library delete operator. set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions") @@ -30,7 +30,7 @@ else() set(END_WHOLE_ARCHIVE -Wl,--no-whole-archive) set(EXPORTS_LINKER_OPTION -Wl,--version-script=${EXPORTS_FILE}) - endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD) + endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD) if(CMAKE_SYSTEM_NAME STREQUAL Darwin) # These options are used to force every object to be included even if it's unused. diff --git a/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt b/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt index fd9af67414..06d4616aba 100644 --- a/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt +++ b/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt @@ -14,9 +14,9 @@ convert_to_absolute_path(DEF_SOURCES1 ${DEF_SOURCES1}) set(EXPORTS_FILE1 ${CMAKE_CURRENT_BINARY_DIR}/dlltest1.exports) generate_exports_file(${DEF_SOURCES1} ${EXPORTS_FILE1}) -if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD) +if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD) set(EXPORTS_LINKER_OPTION1 -Wl,--version-script=${EXPORTS_FILE1}) -endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD) +endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD) if(CMAKE_SYSTEM_NAME STREQUAL Darwin) set(EXPORTS_LINKER_OPTION1 -Wl,-exported_symbols_list,${EXPORTS_FILE1}) @@ -46,9 +46,9 @@ convert_to_absolute_path(DEF_SOURCES2 ${DEF_SOURCES2}) set(EXPORTS_FILE2 ${CMAKE_CURRENT_BINARY_DIR}/dlltest2.exports) generate_exports_file(${DEF_SOURCES2} ${EXPORTS_FILE2}) -if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD) +if(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD) set(EXPORTS_LINKER_OPTION2 -Wl,--version-script=${EXPORTS_FILE2}) -endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD) +endif(CMAKE_SYSTEM_NAME STREQUAL Linux OR CMAKE_SYSTEM_NAME STREQUAL FreeBSD OR CMAKE_SYSTEM_NAME STREQUAL NetBSD) if(CMAKE_SYSTEM_NAME STREQUAL Darwin) set(EXPORTS_LINKER_OPTION2 -Wl,-exported_symbols_list,${EXPORTS_FILE2}) @@ -86,4 +86,3 @@ target_link_libraries(paltest_pal_sxs_test1 paltest_pal_sxs_test1_dll1 paltest_pal_sxs_test1_dll2 ) - |