Fix System.Globalization.Native build on Big Sur

configurecompiler.cmake

@@ -341,8 +341,7 @@ elseif (CLR_CMAKE_PLATFORM_UNIX)
   # This linker option causes executables we build to be marked as containing
   # position independent code.
   # It is necessary to make ASLR work for executables.
-  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1 -Wl,-z,relro,-z,now")
-  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie -Wl,-z,relro,-z,now")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -pie")
 
 endif(WIN32)
 
@@ -359,8 +358,8 @@ endif(CLR_CMAKE_PLATFORM_UNIX)
 
 if(CLR_CMAKE_PLATFORM_LINUX)
   set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,--noexecstack")
-  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")
+  set(CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--build-id=sha1 -Wl,-z,relro,-z,now")
+  set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -Wl,--build-id=sha1 -Wl,-z,relro,-z,now")
 endif(CLR_CMAKE_PLATFORM_LINUX)
 if(CLR_CMAKE_PLATFORM_FREEBSD)
   set(CMAKE_ASM_FLAGS "${CMAKE_ASM_FLAGS} -Wa,--noexecstack")

src/corefx/System.Globalization.Native/CMakeLists.txt

@@ -26,13 +26,7 @@ if (NOT CLR_CMAKE_PLATFORM_DARWIN)
         return()
     endif()
 else()
-    find_library(ICUCORE icucore)
-    if(ICUI18N STREQUAL ICUCORE-NOTFOUND)
-        message(FATAL_ERROR "Cannot find libicucore, skipping build for System.Globalization.Native. .NET globalization is not expected to function.")
-        return()
-    endif()
-
-    add_definitions(-DOSX_ICU_LIBRARY_PATH=\"/usr/lib/libicucore.dylib\")
+    add_definitions(-DOSX_ICU_LIBRARY_PATH="/usr/lib/libicucore.dylib")
 endif()
 
 include(configure.cmake)

src/corefx/System.Globalization.Native/configure.cmake

@@ -1,26 +1,27 @@
-include(CheckCSourceCompiles)
-include(CheckSymbolExists)
+if (CLR_CMAKE_PLATFORM_DARWIN)
+    set(HAVE_SET_MAX_VARIABLE 1)
+    set(HAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS 1)
+else()
+    include(CheckCSourceCompiles)
+    include(CheckSymbolExists)
 
-set(CMAKE_REQUIRED_INCLUDES ${UTYPES_H} ${ICU_HOMEBREW_INC_PATH})
+    set(CMAKE_REQUIRED_INCLUDES ${UTYPES_H} ${ICU_HOMEBREW_INC_PATH})
 
-CHECK_C_SOURCE_COMPILES("
-    #include <unicode/udat.h>
-    int main(void) { enum UDateFormatSymbolType e = UDAT_STANDALONE_SHORTER_WEEKDAYS; }
-" HAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS)
+    CHECK_C_SOURCE_COMPILES("
+        #include <unicode/udat.h>
+        int main(void) { enum UDateFormatSymbolType e = UDAT_STANDALONE_SHORTER_WEEKDAYS; }
+    " HAVE_UDAT_STANDALONE_SHORTER_WEEKDAYS)
 
-if(NOT CLR_CMAKE_PLATFORM_DARWIN)
     set(CMAKE_REQUIRED_LIBRARIES ${ICUUC} ${ICUI18N})
-else()
-    set(CMAKE_REQUIRED_LIBRARIES ${ICUCORE})
-endif()
 
-check_symbol_exists(
-    ucol_setMaxVariable
-    "unicode/ucol.h"
-    HAVE_SET_MAX_VARIABLE)
+    check_symbol_exists(
+        ucol_setMaxVariable
+        "unicode/ucol.h"
+        HAVE_SET_MAX_VARIABLE)
 
-unset(CMAKE_REQUIRED_LIBRARIES)
-unset(CMAKE_REQUIRED_INCLUDES)
+    unset(CMAKE_REQUIRED_LIBRARIES)
+    unset(CMAKE_REQUIRED_INCLUDES)
+endif()
 
 configure_file(
     ${CMAKE_CURRENT_SOURCE_DIR}/config.h.in