From bbfe6292f559e80f17a9ac8bd38d89ca119e796e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 23 Mar 2020 12:26:02 +0100 Subject: [PATCH 1/3] Rename TARGET_DARWIN to TARGET_OSX https://github.com/dotnet/runtime/pull/33716 set TARGET_DARWIN for iOS too but most of the logic is really OSX-specific. Unset TARGET_DARWIN for iOS and rename the rest of the occurrences to TARGET_OSX. --- eng/native/configurecompiler.cmake | 18 ++++++------- eng/native/configureplatform.cmake | 6 ++--- eng/native/configuretools.cmake | 4 +-- eng/native/functions.cmake | 6 ++--- src/coreclr/clrdefinitions.cmake | 12 ++++----- src/coreclr/src/dlls/dbgshim/CMakeLists.txt | 4 +-- src/coreclr/src/dlls/mscordac/CMakeLists.txt | 8 +++--- src/coreclr/src/dlls/mscordbi/CMakeLists.txt | 8 +++--- .../src/dlls/mscoree/coreclr/CMakeLists.txt | 4 +-- src/coreclr/src/gc/CMakeLists.txt | 4 +-- src/coreclr/src/hosts/CMakeLists.txt | 4 +-- src/coreclr/src/inc/crosscomp.h | 6 ++--- src/coreclr/src/jit/CMakeLists.txt | 2 +- src/coreclr/src/pal/src/CMakeLists.txt | 18 ++++++------- src/coreclr/src/pal/src/configure.cmake | 6 ++--- .../pal_sxs/test1/CMakeLists.txt | 8 +++--- .../Exceptions/ForeignThread/CMakeLists.txt | 4 +-- .../corehost/cli/apphost/CMakeLists.txt | 2 +- src/installer/corehost/cli/hostmisc/pal.h | 2 +- .../corehost/cli/hostmisc/pal.unix.cpp | 14 +++++----- src/installer/corehost/cli/hostmisc/utils.h | 2 +- .../cli/test/nativehost/CMakeLists.txt | 2 +- src/libraries/Native/Unix/CMakeLists.txt | 26 +++++++++++-------- .../CMakeLists.txt | 4 +-- .../configure.cmake | 2 +- .../System.Globalization.Native/pal_icushim.c | 8 +++--- .../CMakeLists.txt | 2 +- src/libraries/Native/Unix/configure.cmake | 2 +- 28 files changed, 95 insertions(+), 93 deletions(-) diff --git a/eng/native/configurecompiler.cmake b/eng/native/configurecompiler.cmake index 6ce429b5c4672..d93fe4baa5097 100644 --- a/eng/native/configurecompiler.cmake +++ b/eng/native/configurecompiler.cmake @@ -221,9 +221,9 @@ endif(CLR_CMAKE_HOST_UNIX) if (CLR_CMAKE_HOST_UNIX) add_definitions(-DHOST_UNIX) - if(CLR_CMAKE_HOST_DARWIN) + if(CLR_CMAKE_HOST_OSX) message("Detected OSX x86_64") - endif(CLR_CMAKE_HOST_DARWIN) + endif(CLR_CMAKE_HOST_OSX) if(CLR_CMAKE_HOST_FREEBSD) message("Detected FreeBSD amd64") @@ -278,7 +278,7 @@ if (CLR_CMAKE_HOST_UNIX) # using twos-complement representation (this is normally undefined according to the C++ spec). add_compile_options(-fwrapv) - if(CLR_CMAKE_HOST_DARWIN) + if(CLR_CMAKE_HOST_OSX) # We cannot enable "stack-protector-strong" on OS X due to a bug in clang compiler (current version 7.0.2) add_compile_options(-fstack-protector) else() @@ -286,7 +286,7 @@ if (CLR_CMAKE_HOST_UNIX) if (COMPILER_SUPPORTS_F_STACK_PROTECTOR_STRONG) add_compile_options(-fstack-protector-strong) endif() - endif(CLR_CMAKE_HOST_DARWIN) + endif(CLR_CMAKE_HOST_OSX) # Suppress warnings-as-errors in release branches to reduce servicing churn if (PRERELEASE) @@ -350,20 +350,20 @@ if (CLR_CMAKE_HOST_UNIX) add_compile_options(-fvisibility=hidden) # Specify the minimum supported version of macOS - if(CLR_CMAKE_HOST_DARWIN) + if(CLR_CMAKE_HOST_OSX) set(MACOS_VERSION_MIN_FLAGS -mmacosx-version-min=10.12) add_compile_options(${MACOS_VERSION_MIN_FLAGS}) add_link_options(${MACOS_VERSION_MIN_FLAGS}) - endif(CLR_CMAKE_HOST_DARWIN) + endif(CLR_CMAKE_HOST_OSX) endif(CLR_CMAKE_HOST_UNIX) if(CLR_CMAKE_TARGET_UNIX) add_definitions(-DTARGET_UNIX) # Contracts are disabled on UNIX. add_definitions(-DDISABLE_CONTRACTS) - if(CLR_CMAKE_TARGET_DARWIN) - add_definitions(-DTARGET_DARWIN) - endif(CLR_CMAKE_TARGET_DARWIN) + if(CLR_CMAKE_TARGET_OSX) + add_definitions(-DTARGET_OSX) + endif(CLR_CMAKE_TARGET_OSX) if(CLR_CMAKE_TARGET_FREEBSD) add_definitions(-DTARGET_FREEBSD) endif(CLR_CMAKE_TARGET_FREEBSD) diff --git a/eng/native/configureplatform.cmake b/eng/native/configureplatform.cmake index 5c5accd7d1f66..11ac2643a1e4e 100644 --- a/eng/native/configureplatform.cmake +++ b/eng/native/configureplatform.cmake @@ -84,14 +84,13 @@ endif(CLR_CMAKE_HOST_OS STREQUAL Linux OR CLR_CMAKE_HOST_OS STREQUAL Android) if(CLR_CMAKE_HOST_OS STREQUAL Darwin) set(CLR_CMAKE_HOST_UNIX 1) set(CLR_CMAKE_HOST_UNIX_AMD64 1) - set(CLR_CMAKE_HOST_DARWIN 1) + set(CLR_CMAKE_HOST_OSX 1) set(CMAKE_ASM_COMPILE_OBJECT "${CMAKE_C_COMPILER} -o -c ") endif(CLR_CMAKE_HOST_OS STREQUAL Darwin) if(CLR_CMAKE_HOST_OS STREQUAL iOS) set(CLR_CMAKE_HOST_UNIX 1) set(CLR_CMAKE_HOST_IOS 1) - set(CLR_CMAKE_HOST_DARWIN 1) if(CMAKE_OSX_ARCHITECTURES MATCHES "x86_64") set(CLR_CMAKE_HOST_UNIX_AMD64 1) elseif(CMAKE_OSX_ARCHITECTURES MATCHES "armv7") @@ -250,13 +249,12 @@ endif(CLR_CMAKE_TARGET_OS STREQUAL Android) if(CLR_CMAKE_TARGET_OS STREQUAL Darwin) set(CLR_CMAKE_TARGET_UNIX 1) - set(CLR_CMAKE_TARGET_DARWIN 1) + set(CLR_CMAKE_TARGET_OSX 1) endif(CLR_CMAKE_TARGET_OS STREQUAL Darwin) if(CLR_CMAKE_TARGET_OS STREQUAL iOS) set(CLR_CMAKE_TARGET_UNIX 1) set(CLR_CMAKE_TARGET_IOS 1) - set(CLR_CMAKE_TARGET_DARWIN 1) endif(CLR_CMAKE_TARGET_OS STREQUAL iOS) if(CLR_CMAKE_TARGET_OS STREQUAL FreeBSD) diff --git a/eng/native/configuretools.cmake b/eng/native/configuretools.cmake index 4c0f9694fd72d..9e3a87767a15a 100644 --- a/eng/native/configuretools.cmake +++ b/eng/native/configuretools.cmake @@ -47,7 +47,7 @@ if(NOT WIN32) locate_toolchain_exec(ranlib CMAKE_RANLIB) endif() - if(NOT CLR_CMAKE_TARGET_DARWIN) + if(NOT CLR_CMAKE_TARGET_OSX AND NOT CLR_CMAKE_TARGET_IOS) locate_toolchain_exec(objdump CMAKE_OBJDUMP) if(CMAKE_SYSTEM_NAME STREQUAL Android) @@ -60,5 +60,5 @@ if(NOT WIN32) endif() locate_toolchain_exec(objcopy CMAKE_OBJCOPY) - endif(NOT CLR_CMAKE_TARGET_DARWIN) + endif(NOT CLR_CMAKE_TARGET_OSX AND NOT CLR_CMAKE_TARGET_IOS) endif() diff --git a/eng/native/functions.cmake b/eng/native/functions.cmake index c3766202f8fd4..bd96bc9c599d8 100644 --- a/eng/native/functions.cmake +++ b/eng/native/functions.cmake @@ -254,7 +254,7 @@ function(strip_symbols targetName outputFilename) if (CLR_CMAKE_HOST_UNIX) set(strip_source_file $) - if (CLR_CMAKE_TARGET_DARWIN) + if (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS) set(strip_destination_file ${strip_source_file}.dwarf) # Ensure that dsymutil and strip are present @@ -276,7 +276,7 @@ function(strip_symbols targetName outputFilename) COMMAND ${STRIP} -S ${strip_source_file} COMMENT Stripping symbols from ${strip_source_file} into file ${strip_destination_file} ) - else (CLR_CMAKE_TARGET_DARWIN) + else (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS) set(strip_destination_file ${strip_source_file}.dbg) add_custom_command( @@ -288,7 +288,7 @@ function(strip_symbols targetName outputFilename) COMMAND ${CMAKE_OBJCOPY} --add-gnu-debuglink=${strip_destination_file} ${strip_source_file} COMMENT Stripping symbols from ${strip_source_file} into file ${strip_destination_file} ) - endif (CLR_CMAKE_TARGET_DARWIN) + endif (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS) set(${outputFilename} ${strip_destination_file} PARENT_SCOPE) endif(CLR_CMAKE_HOST_UNIX) diff --git a/src/coreclr/clrdefinitions.cmake b/src/coreclr/clrdefinitions.cmake index 2ea61f45e3177..ce2bc382a9937 100644 --- a/src/coreclr/clrdefinitions.cmake +++ b/src/coreclr/clrdefinitions.cmake @@ -28,10 +28,10 @@ endif (CLR_CMAKE_TARGET_ARCH_ARM64) if (CLR_CMAKE_TARGET_UNIX) - if(CLR_CMAKE_TARGET_DARWIN) + if(CLR_CMAKE_TARGET_OSX) add_definitions(-D_XOPEN_SOURCE) add_definitions(-DFEATURE_DATATARGET4) - endif(CLR_CMAKE_TARGET_DARWIN) + endif(CLR_CMAKE_TARGET_OSX) if (CLR_CMAKE_TARGET_ARCH_AMD64) add_definitions(-DUNIX_AMD64_ABI) @@ -177,9 +177,9 @@ set(FEATURE_READYTORUN 1) add_compile_definitions($<$>>:FEATURE_REJIT>) -if (CLR_CMAKE_HOST_UNIX AND CLR_CMAKE_TARGET_UNIX AND NOT CLR_CMAKE_TARGET_DARWIN) +if (CLR_CMAKE_HOST_UNIX AND CLR_CMAKE_TARGET_UNIX AND NOT CLR_CMAKE_TARGET_OSX) add_definitions(-DFEATURE_REMOTE_PROC_MEM) -endif (CLR_CMAKE_HOST_UNIX AND CLR_CMAKE_TARGET_UNIX AND NOT CLR_CMAKE_TARGET_DARWIN) +endif (CLR_CMAKE_HOST_UNIX AND CLR_CMAKE_TARGET_UNIX AND NOT CLR_CMAKE_TARGET_OSX) if (CLR_CMAKE_TARGET_UNIX OR CLR_CMAKE_TARGET_ARCH_ARM64) add_definitions(-DFEATURE_STUBS_AS_IL) @@ -231,9 +231,9 @@ if(CLR_CMAKE_TARGET_WIN32) endif(CLR_CMAKE_TARGET_ARCH_AMD64 OR CLR_CMAKE_TARGET_ARCH_I386) endif(CLR_CMAKE_TARGET_WIN32) -if(CLR_CMAKE_TARGET_DARWIN) +if(CLR_CMAKE_TARGET_OSX) add_definitions(-DFEATURE_WRITEBARRIER_COPY) -endif(CLR_CMAKE_TARGET_DARWIN) +endif(CLR_CMAKE_TARGET_OSX) if (NOT CLR_CMAKE_TARGET_ARCH_I386 OR NOT CLR_CMAKE_TARGET_WIN32) add_definitions(-DFEATURE_EH_FUNCLETS) diff --git a/src/coreclr/src/dlls/dbgshim/CMakeLists.txt b/src/coreclr/src/dlls/dbgshim/CMakeLists.txt index 52c1f76b92fd8..566dc4084943c 100644 --- a/src/coreclr/src/dlls/dbgshim/CMakeLists.txt +++ b/src/coreclr/src/dlls/dbgshim/CMakeLists.txt @@ -35,10 +35,10 @@ if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) set(EXPORTS_LINKER_OPTION -Wl,--version-script=${EXPORTS_FILE}) endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) -if(CLR_CMAKE_HOST_DARWIN) +if(CLR_CMAKE_HOST_OSX) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-exported_symbols_list,${EXPORTS_FILE}) -endif(CLR_CMAKE_HOST_DARWIN) +endif(CLR_CMAKE_HOST_OSX) add_library_clr(dbgshim SHARED ${DBGSHIM_SOURCES}) diff --git a/src/coreclr/src/dlls/mscordac/CMakeLists.txt b/src/coreclr/src/dlls/mscordac/CMakeLists.txt index aa3c6e815471a..c5d4421589132 100644 --- a/src/coreclr/src/dlls/mscordac/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscordac/CMakeLists.txt @@ -31,9 +31,9 @@ else(CLR_CMAKE_HOST_WIN32) # Add dependency on export file add_custom_target(mscordaccore_exports DEPENDS ${EXPORTS_FILE}) - if(CLR_CMAKE_HOST_DARWIN OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) + if(CLR_CMAKE_HOST_OSX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) generate_exports_file(${DEF_SOURCES} ${EXPORTS_FILE}) - endif(CLR_CMAKE_HOST_DARWIN OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) + endif(CLR_CMAKE_HOST_OSX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) if(CLR_CMAKE_HOST_LINUX) @@ -91,10 +91,10 @@ if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) set(EXPORTS_LINKER_OPTION -Wl,--version-script=${EXPORTS_FILE}) endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) -if(CLR_CMAKE_HOST_DARWIN) +if(CLR_CMAKE_HOST_OSX) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-exported_symbols_list,${EXPORTS_FILE}) -endif(CLR_CMAKE_HOST_DARWIN) +endif(CLR_CMAKE_HOST_OSX) # Create object library to enable creation of proper dependency of mscordaccore.exp on mscordac.obj and # mscordaccore on both the mscordaccore.exp and mscordac.obj. diff --git a/src/coreclr/src/dlls/mscordbi/CMakeLists.txt b/src/coreclr/src/dlls/mscordbi/CMakeLists.txt index 073ea9d7016aa..f125c0b8226a4 100644 --- a/src/coreclr/src/dlls/mscordbi/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscordbi/CMakeLists.txt @@ -3,11 +3,11 @@ # For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling. if(CORECLR_SET_RPATH) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - if(CLR_CMAKE_HOST_DARWIN) + if(CLR_CMAKE_HOST_OSX) set(CMAKE_INSTALL_RPATH "@loader_path") else() set(CMAKE_INSTALL_RPATH "\$ORIGIN") - endif(CLR_CMAKE_HOST_DARWIN) + endif(CLR_CMAKE_HOST_OSX) endif(CORECLR_SET_RPATH) set(MSCORDBI_SOURCES @@ -50,10 +50,10 @@ if(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) set(EXPORTS_LINKER_OPTION -Wl,--version-script=${EXPORTS_FILE}) endif(CLR_CMAKE_HOST_LINUX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) -if(CLR_CMAKE_HOST_DARWIN) +if(CLR_CMAKE_HOST_OSX) # Add linker exports file option set(EXPORTS_LINKER_OPTION -Wl,-exported_symbols_list,${EXPORTS_FILE}) -endif(CLR_CMAKE_HOST_DARWIN) +endif(CLR_CMAKE_HOST_OSX) add_library_clr(mscordbi SHARED ${MSCORDBI_SOURCES}) target_precompile_header(TARGET mscordbi HEADER stdafx.h) diff --git a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt index bc111a0ecb14c..34e544404fb96 100644 --- a/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt +++ b/src/coreclr/src/dlls/mscoree/coreclr/CMakeLists.txt @@ -49,13 +49,13 @@ else(CLR_CMAKE_HOST_WIN32) set(EXPORTS_LINKER_OPTION -Wl,--version-script=${EXPORTS_FILE}) endif(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_NETBSD) - if(CLR_CMAKE_TARGET_DARWIN) + if(CLR_CMAKE_TARGET_OSX) # These options are used to force every object to be included even if it's unused. set(START_WHOLE_ARCHIVE -force_load) set(END_WHOLE_ARCHIVE ) set(EXPORTS_LINKER_OPTION -Wl,-exported_symbols_list,${EXPORTS_FILE}) - endif(CLR_CMAKE_TARGET_DARWIN) + endif(CLR_CMAKE_TARGET_OSX) if(CLR_CMAKE_TARGET_ANDROID AND CLR_CMAKE_HOST_ARCH_ARM) set(EXPORTS_LINKER_OPTION "${EXPORTS_LINKER_OPTION} -Wl,--no-warn-shared-textrel") diff --git a/src/coreclr/src/gc/CMakeLists.txt b/src/coreclr/src/gc/CMakeLists.txt index 8836339cc217e..f94140e2241c8 100644 --- a/src/coreclr/src/gc/CMakeLists.txt +++ b/src/coreclr/src/gc/CMakeLists.txt @@ -102,12 +102,12 @@ if(CLR_CMAKE_HOST_UNIX) endif(CLR_CMAKE_HOST_UNIX) add_definitions(-DBUILD_AS_STANDALONE) -if(CLR_CMAKE_HOST_DARWIN) +if(CLR_CMAKE_HOST_OSX) # The implementation of GCToOSInterface on MacOS makes use of non-POSIX # pthreads APIs, which by default are not included in the pthreads header # unless we define this macro. add_definitions(-D_DARWIN_C_SOURCE) -endif(CLR_CMAKE_HOST_DARWIN) +endif(CLR_CMAKE_HOST_OSX) include_directories(${CMAKE_CURRENT_SOURCE_DIR}) include_directories(${CMAKE_CURRENT_SOURCE_DIR}/env) diff --git a/src/coreclr/src/hosts/CMakeLists.txt b/src/coreclr/src/hosts/CMakeLists.txt index c3a6875feb6e8..0a64c06601ecd 100644 --- a/src/coreclr/src/hosts/CMakeLists.txt +++ b/src/coreclr/src/hosts/CMakeLists.txt @@ -8,7 +8,7 @@ else(CLR_CMAKE_HOST_WIN32) add_subdirectory(unixcoreruncommon) add_subdirectory(unixcorerun) add_subdirectory(unixcoreconsole) - if(CLR_CMAKE_HOST_DARWIN) + if(CLR_CMAKE_HOST_OSX) add_subdirectory(osxbundlerun) - endif(CLR_CMAKE_HOST_DARWIN) + endif(CLR_CMAKE_HOST_OSX) endif(CLR_CMAKE_HOST_WIN32) diff --git a/src/coreclr/src/inc/crosscomp.h b/src/coreclr/src/inc/crosscomp.h index ca8dc33e030cf..81a85641b8e30 100644 --- a/src/coreclr/src/inc/crosscomp.h +++ b/src/coreclr/src/inc/crosscomp.h @@ -18,7 +18,7 @@ #define MAKE_TARGET_DLLNAME_W(name) name W(".dll") #define MAKE_TARGET_DLLNAME_A(name) name ".dll" #else // TARGET_WINDOWS -#ifdef TARGET_DARWIN +#ifdef TARGET_OSX #define MAKE_TARGET_DLLNAME_W(name) W("lib") name W(".dylib") #define MAKE_TARGET_DLLNAME_A(name) "lib" name ".dylib" #else @@ -370,9 +370,9 @@ typedef struct _T_KNONVOLATILE_CONTEXT_POINTERS { #define T_CRITICAL_SECTION_VALIDATION_MESSAGE "T_CRITICAL_SECTION validation failed. It is not in sync with CRITICAL_SECTION" -#if defined(TARGET_DARWIN) && defined(TARGET_X86) +#if defined(TARGET_OSX) && defined(TARGET_X86) #define DAC_CS_NATIVE_DATA_SIZE 76 -#elif defined(TARGET_DARWIN) && defined(TARGET_AMD64) +#elif defined(TARGET_OSX) && defined(TARGET_AMD64) #define DAC_CS_NATIVE_DATA_SIZE 120 #elif defined(TARGET_FREEBSD) && defined(TARGET_X86) #define DAC_CS_NATIVE_DATA_SIZE 12 diff --git a/src/coreclr/src/jit/CMakeLists.txt b/src/coreclr/src/jit/CMakeLists.txt index 5be8e3f96dab3..910fcaa950f2f 100644 --- a/src/coreclr/src/jit/CMakeLists.txt +++ b/src/coreclr/src/jit/CMakeLists.txt @@ -317,7 +317,7 @@ else() set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Xlinker -Bsymbolic -Bsymbolic-functions") set(JIT_EXPORTS_LINKER_OPTION -Wl,--version-script=${JIT_EXPORTS_FILE}) - elseif(CLR_CMAKE_TARGET_DARWIN) + elseif(CLR_CMAKE_TARGET_OSX) set(JIT_EXPORTS_LINKER_OPTION -Wl,-exported_symbols_list,${JIT_EXPORTS_FILE}) endif() diff --git a/src/coreclr/src/pal/src/CMakeLists.txt b/src/coreclr/src/pal/src/CMakeLists.txt index 37aee43257783..40584682ccce8 100644 --- a/src/coreclr/src/pal/src/CMakeLists.txt +++ b/src/coreclr/src/pal/src/CMakeLists.txt @@ -1,7 +1,7 @@ -if(CLR_CMAKE_TARGET_DARWIN OR CLR_CMAKE_TARGET_FREEBSD) +if(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_FREEBSD) # On OSX and *BSD, we use the libunwind that's part of the OS set(CLR_CMAKE_USE_SYSTEM_LIBUNWIND 1) -endif(CLR_CMAKE_TARGET_DARWIN OR CLR_CMAKE_TARGET_FREEBSD) +endif(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_FREEBSD) if(NOT DEFINED ENV{ROOTFS_DIR}) include_directories(SYSTEM /usr/local/include) @@ -14,7 +14,7 @@ if(NOT CLR_CMAKE_USE_SYSTEM_LIBUNWIND) include_directories(${CMAKE_CURRENT_BINARY_DIR}/libunwind/include/tdep) add_subdirectory(libunwind) -elseif(NOT CLR_CMAKE_TARGET_DARWIN) +elseif(NOT CLR_CMAKE_TARGET_OSX) if(CLR_CMAKE_HOST_ARCH_ARM) find_library(UNWIND_ARCH NAMES unwind-arm) endif() @@ -64,7 +64,7 @@ include_directories(include) # Compile options -if(CLR_CMAKE_TARGET_DARWIN) +if(CLR_CMAKE_TARGET_OSX) add_definitions(-DTARGET_OSX) add_definitions(-DXSTATE_SUPPORTED) set(PLATFORM_SOURCES @@ -74,7 +74,7 @@ if(CLR_CMAKE_TARGET_DARWIN) exception/machexception.cpp exception/machmessage.cpp ) -endif(CLR_CMAKE_TARGET_DARWIN) +endif(CLR_CMAKE_TARGET_OSX) if (FEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION) add_definitions(-DFEATURE_ENABLE_NO_ADDRESS_SPACE_RANDOMIZATION) @@ -120,12 +120,12 @@ set(ARCH_SOURCES arch/${PAL_ARCH_SOURCES_DIR}/processor.cpp ) -if(NOT CLR_CMAKE_TARGET_DARWIN) +if(NOT CLR_CMAKE_TARGET_OSX) list(APPEND PLATFORM_SOURCES arch/${PAL_ARCH_SOURCES_DIR}/callsignalhandlerwrapper.S arch/${PAL_ARCH_SOURCES_DIR}/signalhandlerhelper.cpp ) -endif(NOT CLR_CMAKE_TARGET_DARWIN) +endif(NOT CLR_CMAKE_TARGET_OSX) if(CLR_CMAKE_HOST_ARCH_ARM) if (CMAKE_CXX_COMPILER_ID MATCHES "Clang") @@ -261,7 +261,7 @@ if(CLR_CMAKE_TARGET_LINUX) ) endif(CLR_CMAKE_TARGET_LINUX) -if(CLR_CMAKE_TARGET_DARWIN) +if(CLR_CMAKE_TARGET_OSX) find_library(COREFOUNDATION CoreFoundation) find_library(CORESERVICES CoreServices) find_library(SECURITY Security) @@ -272,7 +272,7 @@ if(CLR_CMAKE_TARGET_DARWIN) ${SECURITY} ${SYSTEM} ) -endif(CLR_CMAKE_TARGET_DARWIN) +endif(CLR_CMAKE_TARGET_OSX) if(CLR_CMAKE_TARGET_FREEBSD) target_link_libraries(coreclrpal diff --git a/src/coreclr/src/pal/src/configure.cmake b/src/coreclr/src/pal/src/configure.cmake index 46d88b0915492..048139971879d 100644 --- a/src/coreclr/src/pal/src/configure.cmake +++ b/src/coreclr/src/pal/src/configure.cmake @@ -12,7 +12,7 @@ if(CLR_CMAKE_TARGET_FREEBSD) elseif(CLR_CMAKE_TARGET_SUNOS) set(CMAKE_REQUIRED_INCLUDES /opt/local/include) endif() -if(NOT CLR_CMAKE_TARGET_DARWIN AND NOT CLR_CMAKE_TARGET_FREEBSD AND NOT CLR_CMAKE_TARGET_NETBSD) +if(NOT CLR_CMAKE_TARGET_OSX AND NOT CLR_CMAKE_TARGET_FREEBSD AND NOT CLR_CMAKE_TARGET_NETBSD) set(CMAKE_REQUIRED_DEFINITIONS "-D_BSD_SOURCE -D_SVID_SOURCE -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L") endif() @@ -1335,7 +1335,7 @@ if(NOT CLR_CMAKE_HOST_ARCH_ARM AND NOT CLR_CMAKE_HOST_ARCH_ARM64) set(CMAKE_REQUIRED_LIBRARIES) endif() -if(CLR_CMAKE_TARGET_DARWIN) +if(CLR_CMAKE_TARGET_OSX) set(HAVE__NSGETENVIRON 1) set(DEADLOCK_WHEN_THREAD_IS_SUSPENDED_WHILE_BLOCKED_ON_MUTEX 1) set(PAL_PTRACE "ptrace((cmd), (pid), (caddr_t)(addr), (data))") @@ -1388,6 +1388,6 @@ else() # Anything else is Linux set(PAL_PT_WRITE_D PTRACE_POKEDATA) set(HAS_FTRUNCATE_LENGTH_ISSUE 0) set(HAVE_SCHED_OTHER_ASSIGNABLE 1) -endif(CLR_CMAKE_TARGET_DARWIN) +endif(CLR_CMAKE_TARGET_OSX) configure_file(${CMAKE_CURRENT_SOURCE_DIR}/config.h.in ${CMAKE_CURRENT_BINARY_DIR}/config.h) diff --git a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt index a515268668c99..353e578446292 100644 --- a/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt +++ b/src/coreclr/src/pal/tests/palsuite/exception_handling/pal_sxs/test1/CMakeLists.txt @@ -22,9 +22,9 @@ if(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_NETBSD set(EXPORTS_LINKER_OPTION1 -Wl,--version-script=${EXPORTS_FILE1}) endif(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_NETBSD) -if(CLR_CMAKE_TARGET_DARWIN) +if(CLR_CMAKE_TARGET_OSX) set(EXPORTS_LINKER_OPTION1 -Wl,-exported_symbols_list,${EXPORTS_FILE1}) -endif(CLR_CMAKE_TARGET_DARWIN) +endif(CLR_CMAKE_TARGET_OSX) set(DLL1SOURCES dlltest1.cpp) add_library(paltest_pal_sxs_test1_dll1 SHARED ${DLL1SOURCES}) @@ -54,9 +54,9 @@ if(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_NETBSD set(EXPORTS_LINKER_OPTION2 -Wl,--version-script=${EXPORTS_FILE2}) endif(CLR_CMAKE_TARGET_LINUX OR CLR_CMAKE_TARGET_FREEBSD OR CLR_CMAKE_TARGET_NETBSD) -if(CLR_CMAKE_TARGET_DARWIN) +if(CLR_CMAKE_TARGET_OSX) set(EXPORTS_LINKER_OPTION2 -Wl,-exported_symbols_list,${EXPORTS_FILE2}) -endif(CLR_CMAKE_TARGET_DARWIN) +endif(CLR_CMAKE_TARGET_OSX) set(DLL2SOURCES dlltest2.cpp) add_library(paltest_pal_sxs_test1_dll2 SHARED ${DLL2SOURCES}) diff --git a/src/coreclr/tests/src/Exceptions/ForeignThread/CMakeLists.txt b/src/coreclr/tests/src/Exceptions/ForeignThread/CMakeLists.txt index c04c629275708..e95eb18cec1db 100644 --- a/src/coreclr/tests/src/Exceptions/ForeignThread/CMakeLists.txt +++ b/src/coreclr/tests/src/Exceptions/ForeignThread/CMakeLists.txt @@ -2,10 +2,10 @@ project (ForeignThreadExceptionsNative) include_directories(${INC_PLATFORM_DIR}) -if(CLR_CMAKE_HOST_DARWIN) +if(CLR_CMAKE_HOST_OSX) # Enable non-POSIX pthreads APIs, which by default are not included in the pthreads header add_definitions(-D_DARWIN_C_SOURCE) -endif(CLR_CMAKE_HOST_DARWIN) +endif(CLR_CMAKE_HOST_OSX) set(SOURCES ForeignThreadExceptionsNative.cpp) diff --git a/src/installer/corehost/cli/apphost/CMakeLists.txt b/src/installer/corehost/cli/apphost/CMakeLists.txt index 580d585c16aea..d77f2bfa9811e 100644 --- a/src/installer/corehost/cli/apphost/CMakeLists.txt +++ b/src/installer/corehost/cli/apphost/CMakeLists.txt @@ -10,7 +10,7 @@ set(DOTNET_PROJECT_NAME "apphost") # dependencies is not possible for some reason. # This cannot be enabled for MacOS (Darwin) since its RPATH works in a different way, # doesn't apply to libraries loaded via dlopen and most importantly, it is not transitive. -if (NOT CLR_CMAKE_TARGET_DARWIN) +if (NOT CLR_CMAKE_TARGET_OSX) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(CMAKE_INSTALL_RPATH "\$ORIGIN/netcoredeps") endif() diff --git a/src/installer/corehost/cli/hostmisc/pal.h b/src/installer/corehost/cli/hostmisc/pal.h index c9adc99a95f39..d713fc5b6640a 100644 --- a/src/installer/corehost/cli/hostmisc/pal.h +++ b/src/installer/corehost/cli/hostmisc/pal.h @@ -68,7 +68,7 @@ #define LIB_PREFIX #define MAKE_LIBNAME(NAME) (_X(NAME) _X(".dll")) #define FALLBACK_HOST_RID _X("win10") -#elif defined(TARGET_DARWIN) +#elif defined(TARGET_OSX) #define LIB_PREFIX _X("lib") #define MAKE_LIBNAME(NAME) (LIB_PREFIX _X(NAME) _X(".dylib")) #define FALLBACK_HOST_RID _X("osx.10.12") diff --git a/src/installer/corehost/cli/hostmisc/pal.unix.cpp b/src/installer/corehost/cli/hostmisc/pal.unix.cpp index e3cfb3901506a..73f29412edf49 100644 --- a/src/installer/corehost/cli/hostmisc/pal.unix.cpp +++ b/src/installer/corehost/cli/hostmisc/pal.unix.cpp @@ -15,7 +15,7 @@ #include #include -#if defined(TARGET_DARWIN) +#if defined(TARGET_OSX) #include #include #include @@ -23,7 +23,7 @@ #if defined(TARGET_LINUX) #define symlinkEntrypointExecutable "/proc/self/exe" -#elif !defined(TARGET_DARWIN) +#elif !defined(TARGET_OSX) #define symlinkEntrypointExecutable "/proc/curproc/exe" #endif @@ -162,7 +162,7 @@ bool pal::get_loaded_library( /*out*/ pal::string_t *path) { pal::string_t library_name_local; -#if defined(TARGET_DARWIN) +#if defined(TARGET_OSX) if (!pal::is_path_rooted(library_name)) library_name_local.append("@rpath/"); #endif @@ -467,7 +467,7 @@ bool pal::get_default_installation_dir(pal::string_t* recv) } // *************************** -#if defined(TARGET_DARWIN) +#if defined(TARGET_OSX) recv->assign(_X("/usr/local/share/dotnet")); #else recv->assign(_X("/usr/share/dotnet")); @@ -491,7 +491,7 @@ pal::string_t trim_quotes(pal::string_t stringToCleanup) return stringToCleanup; } -#if defined(TARGET_DARWIN) +#if defined(TARGET_OSX) pal::string_t pal::get_current_os_rid_platform() { pal::string_t ridOS; @@ -679,7 +679,7 @@ pal::string_t pal::get_current_os_rid_platform() } #endif -#if defined(TARGET_DARWIN) +#if defined(TARGET_OSX) bool pal::get_own_executable_path(pal::string_t* recv) { uint32_t path_length = 0; @@ -903,7 +903,7 @@ bool pal::is_running_in_wow64() bool pal::are_paths_equal_with_normalized_casing(const string_t& path1, const string_t& path2) { -#if defined(TARGET_DARWIN) +#if defined(TARGET_OSX) // On Mac, paths are case-insensitive return (strcasecmp(path1.c_str(), path2.c_str()) == 0); #else diff --git a/src/installer/corehost/cli/hostmisc/utils.h b/src/installer/corehost/cli/hostmisc/utils.h index c9afbb68466c1..2f13193e60888 100644 --- a/src/installer/corehost/cli/hostmisc/utils.h +++ b/src/installer/corehost/cli/hostmisc/utils.h @@ -11,7 +11,7 @@ #define _STRINGIFY(s) _X(s) #if defined(_WIN32) #define DOTNET_CORE_INSTALL_PREREQUISITES_URL _X("https://go.microsoft.com/fwlink/?linkid=798306") -#elif defined(TARGET_DARWIN) +#elif defined(TARGET_OSX) #define DOTNET_CORE_INSTALL_PREREQUISITES_URL _X("https://go.microsoft.com/fwlink/?linkid=2063366") #else #define DOTNET_CORE_INSTALL_PREREQUISITES_URL _X("https://go.microsoft.com/fwlink/?linkid=2063370") diff --git a/src/installer/corehost/cli/test/nativehost/CMakeLists.txt b/src/installer/corehost/cli/test/nativehost/CMakeLists.txt index 8b5444a556550..82d3cbcb36acd 100644 --- a/src/installer/corehost/cli/test/nativehost/CMakeLists.txt +++ b/src/installer/corehost/cli/test/nativehost/CMakeLists.txt @@ -8,7 +8,7 @@ set(DOTNET_PROJECT_NAME "nativehost") set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) set(MACOSX_RPATH ON) -if (CLR_CMAKE_TARGET_DARWIN) +if (CLR_CMAKE_TARGET_OSX) set(CMAKE_INSTALL_RPATH "@loader_path") else() set(CMAKE_INSTALL_RPATH "\$ORIGIN") diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt index d921d23d2bf94..c9728f6e3da5d 100644 --- a/src/libraries/Native/Unix/CMakeLists.txt +++ b/src/libraries/Native/Unix/CMakeLists.txt @@ -5,6 +5,10 @@ project(CoreFX C) include(${CLR_ENG_NATIVE_DIR}/configuretools.cmake) +if(CLR_CMAKE_TARGET_IOS) + cmake_minimum_required(VERSION 3.14.5) +endif() + if(NOT CLR_CMAKE_TARGET_ARCH_WASM) cmake_policy(SET CMP0083 NEW) endif(NOT CLR_CMAKE_TARGET_ARCH_WASM) @@ -127,7 +131,7 @@ else () endif () if(CLR_CMAKE_TARGET_ARCH_WASM) -elseif (CLR_CMAKE_TARGET_DARWIN) +elseif (CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS) add_definitions(-D__APPLE_USE_RFC_3542) # We cannot enable "stack-protector-strong" on OS X due to a bug in clang compiler (current version 7.0.2) @@ -152,15 +156,15 @@ endif(CLR_CMAKE_TARGET_FREEBSD) # ./build-native.sh cmakeargs -DCLR_ADDITIONAL_COMPILER_OPTIONS=<...> cmakeargs -DCLR_ADDITIONAL_LINKER_FLAGS=<...> # if(CLR_CMAKE_TARGET_UNIX) - if (CLR_CMAKE_TARGET_DARWIN) - add_definitions(-DTARGET_DARWIN) - add_link_options(-Wl,-bind_at_load) - elseif (CLR_CMAKE_TARGET_ARCH_WASM) - # No object stripping for WASM - else (CLR_CMAKE_TARGET_DARWIN) - add_compile_options($<$:-Wa,--noexecstack>) - add_link_options(-Wl,--build-id=sha1 -Wl,-z,relro,-z,now) - endif(CLR_CMAKE_TARGET_DARWIN) + if(NOT CLR_CMAKE_TARGET_ARCH_WASM AND NOT CLR_CMAKE_TARGET_IOS) + if(CLR_CMAKE_TARGET_OSX) + add_definitions(-DTARGET_OSX) + add_link_options(-Wl,-bind_at_load) + else() + add_compile_options($<$:-Wa,--noexecstack>) + add_link_options(-Wl,--build-id=sha1 -Wl,-z,relro,-z,now) + endif() + endif() set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} ${CLR_ADDITIONAL_LINKER_FLAGS}") set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} ${CLR_ADDITIONAL_LINKER_FLAGS}" ) @@ -199,6 +203,6 @@ if (NOT CLR_CMAKE_TARGET_ARCH_WASM AND NOT CLR_CMAKE_TARGET_IOS) # TODO: reenab add_subdirectory(System.Security.Cryptography.Native) endif() -if(CLR_CMAKE_TARGET_DARWIN) +if(CLR_CMAKE_TARGET_OSX OR CLR_CMAKE_TARGET_IOS) add_subdirectory(System.Security.Cryptography.Native.Apple) endif() diff --git a/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt index fbab4fad5868e..86ddba4d42e5b 100644 --- a/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt +++ b/src/libraries/Native/Unix/System.Globalization.Native/CMakeLists.txt @@ -21,7 +21,7 @@ if(CLR_CMAKE_TARGET_UNIX) return() endif() - if(CLR_CMAKE_TARGET_DARWIN) + if(CLR_CMAKE_TARGET_OSX) find_library(ICUCORE icucore) if(ICUCORE STREQUAL ICUCORE-NOTFOUND) message(FATAL_ERROR "Cannot find libicucore, skipping build for System.Globalization.Native. .NET globalization is not expected to function.") @@ -86,7 +86,7 @@ set_target_properties(System.Globalization.Native-Static PROPERTIES OUTPUT_NAME install (TARGETS System.Globalization.Native-Static DESTINATION .) -if(NOT CLR_CMAKE_TARGET_DARWIN) +if(NOT CLR_CMAKE_TARGET_OSX AND NOT CLR_CMAKE_TARGET_IOS) if (GEN_SHARED_LIB) add_custom_command(TARGET System.Globalization.Native POST_BUILD COMMENT "Verifying System.Globalization.Native.so dependencies" diff --git a/src/libraries/Native/Unix/System.Globalization.Native/configure.cmake b/src/libraries/Native/Unix/System.Globalization.Native/configure.cmake index 68718edaea8b3..8919b80537af1 100644 --- a/src/libraries/Native/Unix/System.Globalization.Native/configure.cmake +++ b/src/libraries/Native/Unix/System.Globalization.Native/configure.cmake @@ -14,7 +14,7 @@ if (CLR_CMAKE_TARGET_UNIX) int main(void) { enum UDateFormatSymbolType e = UDAT_STANDALONE_SHORTER_WEEKDAYS; } " HAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS) - if(CLR_CMAKE_TARGET_DARWIN) + if(CLR_CMAKE_TARGET_OSX) set(CMAKE_REQUIRED_LIBRARIES ${ICUCORE}) else() set(CMAKE_REQUIRED_LIBRARIES ${ICUUC} ${ICUI18N}) diff --git a/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c b/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c index 51e60a0a14b3b..6d4dc1e7d477b 100644 --- a/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c +++ b/src/libraries/Native/Unix/System.Globalization.Native/pal_icushim.c @@ -41,7 +41,7 @@ static int FindICULibs() return TRUE; } -#elif defined(TARGET_DARWIN) +#elif defined(TARGET_OSX) static int FindICULibs() { @@ -63,7 +63,7 @@ static int FindICULibs() return TRUE; } -#else // !TARGET_WINDOWS && !TARGET_DARWIN +#else // !TARGET_WINDOWS && !TARGET_OSX #define VERSION_PREFIX_NONE "" #define VERSION_PREFIX_SUSE "suse" @@ -282,7 +282,7 @@ int32_t GlobalizationNative_LoadICU() fn##_ptr = (__typeof(fn)*)GetProcAddress((HMODULE)lib, #fn); \ if (fn##_ptr == NULL) { fprintf(stderr, "Cannot get symbol %s from " #lib "\nError: %u\n", #fn, GetLastError()); abort(); } -#elif defined(TARGET_DARWIN) +#elif defined(TARGET_OSX) if (!FindICULibs()) { @@ -294,7 +294,7 @@ int32_t GlobalizationNative_LoadICU() fn##_ptr = (__typeof(fn)*)dlsym(lib, #fn); \ if (fn##_ptr == NULL) { fprintf(stderr, "Cannot get symbol %s from " #lib "\nError: %s\n", #fn, dlerror()); abort(); } -#else // !TARGET_WINDOWS && !TARGET_DARWIN +#else // !TARGET_WINDOWS && !TARGET_OSX char symbolName[128]; char symbolVersion[MaxICUVersionStringLength + 1] = ""; diff --git a/src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt b/src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt index c1e5f6dedab0f..fd7563c73cd85 100644 --- a/src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt +++ b/src/libraries/Native/Unix/System.Security.Cryptography.Native/CMakeLists.txt @@ -52,7 +52,7 @@ set(NATIVECRYPTO_SOURCES # Always build portable on macOS because OpenSSL is not a system component # and our prebuilts should not assume a specific ABI version for the types # that use OpenSSL at runtime. -if (CLR_CMAKE_TARGET_DARWIN) +if (CLR_CMAKE_TARGET_OSX) set(FEATURE_DISTRO_AGNOSTIC_SSL True) endif() diff --git a/src/libraries/Native/Unix/configure.cmake b/src/libraries/Native/Unix/configure.cmake index 6641104a99fdf..30b76c018913e 100644 --- a/src/libraries/Native/Unix/configure.cmake +++ b/src/libraries/Native/Unix/configure.cmake @@ -10,7 +10,7 @@ include(CheckFunctionExists) if (CLR_CMAKE_TARGET_LINUX) set(PAL_UNIX_NAME \"LINUX\") -elseif (CLR_CMAKE_TARGET_DARWIN) +elseif (CLR_CMAKE_TARGET_OSX) set(PAL_UNIX_NAME \"OSX\") # Xcode's clang does not include /usr/local/include by default, but brew's does. From 16e1d309221e70d4f3d484e8c8a4fb2a4347f83c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 23 Mar 2020 14:57:15 +0100 Subject: [PATCH 2/3] PR feedback --- src/coreclr/src/debug/createdump/CMakeLists.txt | 4 ++-- src/coreclr/src/debug/daccess/CMakeLists.txt | 4 ++-- src/libraries/Native/Unix/CMakeLists.txt | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/coreclr/src/debug/createdump/CMakeLists.txt b/src/coreclr/src/debug/createdump/CMakeLists.txt index d29eda513855f..fc5fff69c3f20 100644 --- a/src/coreclr/src/debug/createdump/CMakeLists.txt +++ b/src/coreclr/src/debug/createdump/CMakeLists.txt @@ -8,11 +8,11 @@ include(configure.cmake) # For more information: http://www.cmake.org/Wiki/CMake_RPATH_handling. if (CORECLR_SET_RPATH) set(CMAKE_BUILD_WITH_INSTALL_RPATH TRUE) - if(CLR_CMAKE_HOST_DARWIN) + if(CLR_CMAKE_HOST_OSX) set(CMAKE_INSTALL_RPATH "@loader_path") else() set(CMAKE_INSTALL_RPATH "\$ORIGIN") - endif(CLR_CMAKE_HOST_DARWIN) + endif(CLR_CMAKE_HOST_OSX) endif (CORECLR_SET_RPATH) remove_definitions(-DUNICODE) diff --git a/src/coreclr/src/debug/daccess/CMakeLists.txt b/src/coreclr/src/debug/daccess/CMakeLists.txt index bbee976ecb246..b56c37c623e87 100644 --- a/src/coreclr/src/debug/daccess/CMakeLists.txt +++ b/src/coreclr/src/debug/daccess/CMakeLists.txt @@ -41,7 +41,7 @@ target_precompile_header(TARGET daccess HEADER stdafx.h) add_dependencies(daccess eventing_headers) -if(CLR_CMAKE_HOST_DARWIN OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) +if(CLR_CMAKE_HOST_OSX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) add_definitions(-DUSE_DAC_TABLE_RVA) add_custom_command( @@ -63,4 +63,4 @@ if(CLR_CMAKE_HOST_DARWIN OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) ) add_dependencies(daccess dactablerva_header) -endif(CLR_CMAKE_HOST_DARWIN OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) +endif(CLR_CMAKE_HOST_OSX OR CLR_CMAKE_HOST_FREEBSD OR CLR_CMAKE_HOST_NETBSD) diff --git a/src/libraries/Native/Unix/CMakeLists.txt b/src/libraries/Native/Unix/CMakeLists.txt index c9728f6e3da5d..a4bc235c63ba4 100644 --- a/src/libraries/Native/Unix/CMakeLists.txt +++ b/src/libraries/Native/Unix/CMakeLists.txt @@ -6,6 +6,7 @@ project(CoreFX C) include(${CLR_ENG_NATIVE_DIR}/configuretools.cmake) if(CLR_CMAKE_TARGET_IOS) + # CMake 3.14.5 contains bug fixes for iOS cmake_minimum_required(VERSION 3.14.5) endif() From bca9b758a320d72f694566f40c2b6765c006db9a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20K=C3=B6plinger?= Date: Mon, 23 Mar 2020 19:36:25 +0100 Subject: [PATCH 3/3] Fix build of pal_mstypes.h --- src/coreclr/src/pal/inc/pal_mstypes.h | 3 --- 1 file changed, 3 deletions(-) diff --git a/src/coreclr/src/pal/inc/pal_mstypes.h b/src/coreclr/src/pal/inc/pal_mstypes.h index d6e9de1b0d797..e89a8773dc37d 100644 --- a/src/coreclr/src/pal/inc/pal_mstypes.h +++ b/src/coreclr/src/pal/inc/pal_mstypes.h @@ -213,8 +213,6 @@ extern "C" { // includes are not included, so we need to define them. #ifndef PAL_IMPLEMENTATION -// OS X already defines these types in 64 bit -#if !defined(TARGET_OSX) typedef __int64 int64_t; typedef unsigned __int64 uint64_t; typedef __int32 int32_t; @@ -223,7 +221,6 @@ typedef __int16 int16_t; typedef unsigned __int16 uint16_t; typedef __int8 int8_t; typedef unsigned __int8 uint8_t; -#endif #endif // PAL_IMPLEMENTATION