summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomas Weinfurt <tweinfurt@yahoo.com>2018-11-12 12:49:36 -0800
committerGitHub <noreply@github.com>2018-11-12 12:49:36 -0800
commit0aab97266ea6620a17a20804c7aebfcdbd37a5b0 (patch)
treefef9db256988076efaae7b889b211bb348a36796
parent214c3b62d889b2ff57425ab3f4ce70adf7503be6 (diff)
downloadcoreclr-0aab97266ea6620a17a20804c7aebfcdbd37a5b0.tar.gz
coreclr-0aab97266ea6620a17a20804c7aebfcdbd37a5b0.tar.bz2
coreclr-0aab97266ea6620a17a20804c7aebfcdbd37a5b0.zip
enable build-id on FreeBSD (#20945)
-rw-r--r--configurecompiler.cmake5
-rw-r--r--src/vm/CMakeLists.txt1
2 files changed, 5 insertions, 1 deletions
diff --git a/configurecompiler.cmake b/configurecompiler.cmake
index 6567cefbb2..d3c91115e2 100644
--- a/configurecompiler.cmake
+++ b/configurecompiler.cmake
@@ -331,6 +331,11 @@ if(CLR_CMAKE_PLATFORM_LINUX)
set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1")
set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id=sha1")
endif(CLR_CMAKE_PLATFORM_LINUX)
+if(CLR_CMAKE_PLATFORM_FREEBSD)
+ set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,--noexecstack")
+ set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -fuse-ld=lld -Xlinker --build-id=sha1")
+ set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -fuse-ld=lld -Xlinker --build-id=sha1")
+endif(CLR_CMAKE_PLATFORM_FREEBSD)
#------------------------------------
# Definitions (for platform)
diff --git a/src/vm/CMakeLists.txt b/src/vm/CMakeLists.txt
index 1e68b9938a..1a94d82671 100644
--- a/src/vm/CMakeLists.txt
+++ b/src/vm/CMakeLists.txt
@@ -846,7 +846,6 @@ if(CLR_CMAKE_PLATFORM_UNIX)
endif(CLR_CMAKE_PLATFORM_UNIX)
set(VM_SOURCES_DAC_ARCH
- gcinfodecoder.cpp
exceptionhandling.cpp
)