From 0daa80b4e3722682f218fd4cff785e9daf7cb65e Mon Sep 17 00:00:00 2001 From: Meri Khamoyan Date: Fri, 22 Dec 2023 10:02:15 +0100 Subject: [PATCH 1/3] Fix xamarin_macios build after system ICU change --- src/mono/mono/mini/CMakeLists.txt | 8 ++++++++ .../libs/System.Globalization.Native/CMakeLists.txt | 8 ++++++++ 2 files changed, 16 insertions(+) diff --git a/src/mono/mono/mini/CMakeLists.txt b/src/mono/mono/mini/CMakeLists.txt index 609765da38e359..994bf01308e33f 100644 --- a/src/mono/mono/mini/CMakeLists.txt +++ b/src/mono/mono/mini/CMakeLists.txt @@ -62,6 +62,14 @@ if(HAVE_SYS_ICU) entrypoints.c ${pal_icushim_sources_base}) +if(CLR_CMAKE_TARGET_IOS) + add_definitions(-DTARGET_IOS) +elseif(CLR_CMAKE_TARGET_TVOS) + add_definitions(-DTARGET_TVOS) +elseif(CLR_CMAKE_TARGET_MACCATALYST) + add_definitions(-DTARGET_MACCATALYST) +endif() + if (NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS) set(icu_shim_sources_base ${icu_shim_sources_base} diff --git a/src/native/libs/System.Globalization.Native/CMakeLists.txt b/src/native/libs/System.Globalization.Native/CMakeLists.txt index 5e9ccb1e8991be..84e3f29209d28f 100644 --- a/src/native/libs/System.Globalization.Native/CMakeLists.txt +++ b/src/native/libs/System.Globalization.Native/CMakeLists.txt @@ -106,6 +106,14 @@ else() set(NATIVEGLOBALIZATION_SOURCES ${NATIVEGLOBALIZATION_SOURCES} pal_icushim.c) endif() +if(CLR_CMAKE_TARGET_IOS) + add_definitions(-DTARGET_IOS) +elseif(CLR_CMAKE_TARGET_TVOS) + add_definitions(-DTARGET_TVOS) +elseif(CLR_CMAKE_TARGET_MACCATALYST) + add_definitions(-DTARGET_MACCATALYST) +endif() + if (CLR_CMAKE_TARGET_APPLE) set(NATIVEGLOBALIZATION_SOURCES_OBJC pal_locale.m From a5f62a6a31f9f873f3db397f6128a0294f913d8b Mon Sep 17 00:00:00 2001 From: Meri Khamoyan Date: Fri, 22 Dec 2023 12:07:31 +0100 Subject: [PATCH 2/3] Minor fix --- src/mono/mono/mini/CMakeLists.txt | 15 +++++++-------- .../System.Globalization.Native/CMakeLists.txt | 15 +++++++-------- 2 files changed, 14 insertions(+), 16 deletions(-) diff --git a/src/mono/mono/mini/CMakeLists.txt b/src/mono/mono/mini/CMakeLists.txt index 994bf01308e33f..d5dbda721772a4 100644 --- a/src/mono/mono/mini/CMakeLists.txt +++ b/src/mono/mono/mini/CMakeLists.txt @@ -62,14 +62,6 @@ if(HAVE_SYS_ICU) entrypoints.c ${pal_icushim_sources_base}) -if(CLR_CMAKE_TARGET_IOS) - add_definitions(-DTARGET_IOS) -elseif(CLR_CMAKE_TARGET_TVOS) - add_definitions(-DTARGET_TVOS) -elseif(CLR_CMAKE_TARGET_MACCATALYST) - add_definitions(-DTARGET_MACCATALYST) -endif() - if (NOT CLR_CMAKE_TARGET_MACCATALYST AND NOT CLR_CMAKE_TARGET_IOS AND NOT CLR_CMAKE_TARGET_TVOS) set(icu_shim_sources_base ${icu_shim_sources_base} @@ -87,6 +79,13 @@ endif() addprefix(icu_shim_sources "${ICU_SHIM_PATH}" "${icu_shim_sources_base}") if (TARGET_DARWIN) + if(CLR_CMAKE_TARGET_IOS) + add_definitions(-DTARGET_IOS) + elseif(CLR_CMAKE_TARGET_TVOS) + add_definitions(-DTARGET_TVOS) + elseif(CLR_CMAKE_TARGET_MACCATALYST) + add_definitions(-DTARGET_MACCATALYST) + endif() set(icu_shim_darwin_sources_base pal_locale.m pal_collation.m diff --git a/src/native/libs/System.Globalization.Native/CMakeLists.txt b/src/native/libs/System.Globalization.Native/CMakeLists.txt index 84e3f29209d28f..fabfedd61b84b8 100644 --- a/src/native/libs/System.Globalization.Native/CMakeLists.txt +++ b/src/native/libs/System.Globalization.Native/CMakeLists.txt @@ -106,15 +106,14 @@ else() set(NATIVEGLOBALIZATION_SOURCES ${NATIVEGLOBALIZATION_SOURCES} pal_icushim.c) endif() -if(CLR_CMAKE_TARGET_IOS) - add_definitions(-DTARGET_IOS) -elseif(CLR_CMAKE_TARGET_TVOS) - add_definitions(-DTARGET_TVOS) -elseif(CLR_CMAKE_TARGET_MACCATALYST) - add_definitions(-DTARGET_MACCATALYST) -endif() - if (CLR_CMAKE_TARGET_APPLE) + if(CLR_CMAKE_TARGET_IOS) + add_definitions(-DTARGET_IOS) + elseif(CLR_CMAKE_TARGET_TVOS) + add_definitions(-DTARGET_TVOS) + elseif(CLR_CMAKE_TARGET_MACCATALYST) + add_definitions(-DTARGET_MACCATALYST) + endif() set(NATIVEGLOBALIZATION_SOURCES_OBJC pal_locale.m pal_collation.m From 39bc3ea6527f3d12b25d589d8d8216e5cf6e2d30 Mon Sep 17 00:00:00 2001 From: Meri Khamoyan Date: Fri, 22 Dec 2023 13:21:54 +0100 Subject: [PATCH 3/3] Revert from mono/mini/CMakeLists.txt --- src/mono/mono/mini/CMakeLists.txt | 7 ------- 1 file changed, 7 deletions(-) diff --git a/src/mono/mono/mini/CMakeLists.txt b/src/mono/mono/mini/CMakeLists.txt index d5dbda721772a4..609765da38e359 100644 --- a/src/mono/mono/mini/CMakeLists.txt +++ b/src/mono/mono/mini/CMakeLists.txt @@ -79,13 +79,6 @@ endif() addprefix(icu_shim_sources "${ICU_SHIM_PATH}" "${icu_shim_sources_base}") if (TARGET_DARWIN) - if(CLR_CMAKE_TARGET_IOS) - add_definitions(-DTARGET_IOS) - elseif(CLR_CMAKE_TARGET_TVOS) - add_definitions(-DTARGET_TVOS) - elseif(CLR_CMAKE_TARGET_MACCATALYST) - add_definitions(-DTARGET_MACCATALYST) - endif() set(icu_shim_darwin_sources_base pal_locale.m pal_collation.m