From 82596f4911bee9bffd1aa8c3e9d7430d85657c0a Mon Sep 17 00:00:00 2001 From: Filip Navara Date: Sun, 2 Feb 2025 22:25:44 +0100 Subject: [PATCH] [daccess] Do not use USE_DAC_TABLE_RVA on Apple platforms --- src/coreclr/debug/daccess/CMakeLists.txt | 4 ++-- src/coreclr/debug/dbgutil/CMakeLists.txt | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/coreclr/debug/daccess/CMakeLists.txt b/src/coreclr/debug/daccess/CMakeLists.txt index fa26f55cc37fa2..6c02154de2e4de 100644 --- a/src/coreclr/debug/daccess/CMakeLists.txt +++ b/src/coreclr/debug/daccess/CMakeLists.txt @@ -47,7 +47,7 @@ target_link_libraries(daccess PRIVATE cdacreader_api) add_dependencies(daccess eventing_headers) -if(CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS OR CLR_CMAKE_HOST_APPLE) +if(CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS) add_definitions(-DUSE_DAC_TABLE_RVA) set(args $<$>:--dynamic> $ ${GENERATED_INCLUDE_DIR}/dactablerva.h) @@ -72,4 +72,4 @@ if(CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS OR CL ) add_dependencies(daccess dactablerva_header) -endif(CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS OR CLR_CMAKE_HOST_APPLE) +endif(CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD OR CLR_CMAKE_HOST_SUNOS) diff --git a/src/coreclr/debug/dbgutil/CMakeLists.txt b/src/coreclr/debug/dbgutil/CMakeLists.txt index 0ad223630a5839..802f56eb6061cc 100644 --- a/src/coreclr/debug/dbgutil/CMakeLists.txt +++ b/src/coreclr/debug/dbgutil/CMakeLists.txt @@ -23,10 +23,10 @@ if(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_HAIKU) ) endif(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_HAIKU) -if(CLR_CMAKE_TARGET_OSX) +if(CLR_CMAKE_TARGET_APPLE) list(APPEND DBGUTIL_SOURCES machoreader.cpp ) -endif(CLR_CMAKE_TARGET_OSX) +endif(CLR_CMAKE_TARGET_APPLE) add_library_clr(dbgutil STATIC ${DBGUTIL_SOURCES})