From e030dd800795ec6f34ffeacc43bf89670c248beb Mon Sep 17 00:00:00 2001 From: Eric Miotto Date: Wed, 17 Sep 2025 06:28:59 -0700 Subject: [PATCH 1/2] Add Apple vendor caches for Runtime Addresses rdar://160774478 --- .../caches/Vendors/Apple/apple-common.cmake | 7 +++++++ .../Apple/arm64-AppleTVOS-simulator.cmake | 13 +++++++++++++ .../Vendors/Apple/arm64-AppleTVOS.cmake | 13 +++++++++++++ .../caches/Vendors/Apple/arm64-BridgeOS.cmake | 14 ++++++++++++++ .../caches/Vendors/Apple/arm64-MacOSX.cmake | 19 +++++++++++++++++++ .../Apple/arm64-WatchOS-simulator.cmake | 13 +++++++++++++ .../Vendors/Apple/arm64-XROS-simulator.cmake | 13 +++++++++++++ .../Apple/arm64-iPhoneOS-simulator.cmake | 13 +++++++++++++ .../caches/Vendors/Apple/arm64-iPhoneOS.cmake | 13 +++++++++++++ .../Vendors/Apple/arm64_32-WatchOS.cmake | 13 +++++++++++++ .../Vendors/Apple/arm64e-AppleTVOS.cmake | 13 +++++++++++++ .../caches/Vendors/Apple/arm64e-MacOSX.cmake | 19 +++++++++++++++++++ .../caches/Vendors/Apple/arm64e-WatchOS.cmake | 13 +++++++++++++ .../caches/Vendors/Apple/arm64e-XROS.cmake | 13 +++++++++++++ .../Vendors/Apple/arm64e-iPhoneOS.cmake | 13 +++++++++++++ .../Apple/x86_64-AppleTVOS-simulator.cmake | 13 +++++++++++++ .../caches/Vendors/Apple/x86_64-MacOSX.cmake | 19 +++++++++++++++++++ .../Apple/x86_64-WatchOS-simulator.cmake | 13 +++++++++++++ .../Vendors/Apple/x86_64-XROS-simulator.cmake | 13 +++++++++++++ .../Apple/x86_64-iPhoneOS-simulator.cmake | 13 +++++++++++++ 20 files changed, 273 insertions(+) create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/apple-common.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-AppleTVOS-simulator.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-AppleTVOS.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-MacOSX.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-WatchOS-simulator.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-XROS-simulator.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-iPhoneOS-simulator.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-iPhoneOS.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64_32-WatchOS.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-AppleTVOS.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-MacOSX.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-WatchOS.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-XROS.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-iPhoneOS.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-AppleTVOS-simulator.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-MacOSX.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-WatchOS-simulator.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-XROS-simulator.cmake create mode 100644 Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-iPhoneOS-simulator.cmake diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/apple-common.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/apple-common.cmake new file mode 100644 index 0000000000000..c9c6a653b5f5a --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/apple-common.cmake @@ -0,0 +1,7 @@ +set(CMAKE_BUILD_TYPE RelWithDebInfo CACHE STRING "") +set(BUILD_SHARED_LIBS YES CACHE BOOL "") +set(SwiftRuntime_INSTALL_NESTED_SUBDIR OFF CACHE BOOL "") + +set(CMAKE_CXX_FLAGS_MINSIZEREL "-Os -g -DNDEBUG" CACHE STRING "") +set(CMAKE_C_FLAGS_MINSIZEREL "-Os -g -DNDEBUG" CACHE STRING "") +set(CMAKE_Swift_FLAGS_MINSIZEREL "-Osize -g" CACHE STRING "") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-AppleTVOS-simulator.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-AppleTVOS-simulator.cmake new file mode 100644 index 0000000000000..82f638c1fb314 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-AppleTVOS-simulator.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR appletvsimulator CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-AppleTVOS.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-AppleTVOS.cmake new file mode 100644 index 0000000000000..2b0f2ee3ff460 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-AppleTVOS.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR appletvos CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake new file mode 100644 index 0000000000000..906d0de530e74 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake @@ -0,0 +1,14 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR freestanding CACHE STRING "") +set(CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-MacOSX.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-MacOSX.cmake new file mode 100644 index 0000000000000..eee4456ed376e --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-MacOSX.cmake @@ -0,0 +1,19 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +if(NOT DEFINED SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET) + message(SEND_ERROR "SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR macosx CACHE STRING "") + +set(SwiftRuntime_COMPILER_VARIANT_TARGET "arm64-apple-ios${SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET}-macabi" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-WatchOS-simulator.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-WatchOS-simulator.cmake new file mode 100644 index 0000000000000..fb95f35260f44 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-WatchOS-simulator.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR watchsimulator CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-XROS-simulator.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-XROS-simulator.cmake new file mode 100644 index 0000000000000..d2bb8d507d48f --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-XROS-simulator.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR xrsimulator CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-iPhoneOS-simulator.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-iPhoneOS-simulator.cmake new file mode 100644 index 0000000000000..ddcc3eea762f9 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-iPhoneOS-simulator.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR iphonesimulator CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-iPhoneOS.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-iPhoneOS.cmake new file mode 100644 index 0000000000000..e865103e11e7e --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64-iPhoneOS.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR iphoneos CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64_32-WatchOS.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64_32-WatchOS.cmake new file mode 100644 index 0000000000000..e868d98242378 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64_32-WatchOS.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64_32-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64_32-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64_32-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64_32-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64_32 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR watchos CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-AppleTVOS.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-AppleTVOS.cmake new file mode 100644 index 0000000000000..442e0c24d53b7 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-AppleTVOS.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64e-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64e-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64e-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64e-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64e CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR appletvos CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-MacOSX.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-MacOSX.cmake new file mode 100644 index 0000000000000..cb66c9186c1a9 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-MacOSX.cmake @@ -0,0 +1,19 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +if(NOT DEFINED SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET) + message(SEND_ERROR "SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64e-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64e-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64e-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64e-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64e CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR macosx CACHE STRING "") + +set(SwiftRuntime_COMPILER_VARIANT_TARGET "arm64e-apple-ios${SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET}-macabi" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-WatchOS.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-WatchOS.cmake new file mode 100644 index 0000000000000..b396f71938b00 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-WatchOS.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64e-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64e-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64e-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64e-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64e CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR watchos CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-XROS.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-XROS.cmake new file mode 100644 index 0000000000000..8ad219e0d9b63 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-XROS.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64e-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64e-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64e-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64e-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64e CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR xros CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-iPhoneOS.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-iPhoneOS.cmake new file mode 100644 index 0000000000000..4c5e720d89860 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/arm64e-iPhoneOS.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "arm64e-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "arm64e-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "arm64e-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "arm64e-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR arm64e CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR iphoneos CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-AppleTVOS-simulator.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-AppleTVOS-simulator.cmake new file mode 100644 index 0000000000000..3ffc99ce744eb --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-AppleTVOS-simulator.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "x86_64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "x86_64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "x86_64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "x86_64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR x86_64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR appletvsimulator CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-MacOSX.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-MacOSX.cmake new file mode 100644 index 0000000000000..07617d2ed45c6 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-MacOSX.cmake @@ -0,0 +1,19 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +if(NOT DEFINED SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET) + message(SEND_ERROR "SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "x86_64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "x86_64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "x86_64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "x86_64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR x86_64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR macosx CACHE STRING "") + +set(SwiftRuntime_COMPILER_VARIANT_TARGET "x86_64-apple-ios${SwiftRuntime_TARGET_VARIANT_DEPLOYMENT_TARGET}-macabi" CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-WatchOS-simulator.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-WatchOS-simulator.cmake new file mode 100644 index 0000000000000..3881f1275e902 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-WatchOS-simulator.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "x86_64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "x86_64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "x86_64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "x86_64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR x86_64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR watchsimulator CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-XROS-simulator.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-XROS-simulator.cmake new file mode 100644 index 0000000000000..3444825474404 --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-XROS-simulator.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "x86_64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "x86_64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "x86_64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "x86_64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR x86_64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR xrsimulator CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-iPhoneOS-simulator.cmake b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-iPhoneOS-simulator.cmake new file mode 100644 index 0000000000000..4b85b59edb53e --- /dev/null +++ b/Runtimes/Supplemental/Runtime/cmake/caches/Vendors/Apple/x86_64-iPhoneOS-simulator.cmake @@ -0,0 +1,13 @@ +if(NOT DEFINED CMAKE_OSX_DEPLOYMENT_TARGET) + message(SEND_ERROR "CMAKE_OSX_DEPLOYMENT_TARGET not defined") +endif() + +set(CMAKE_C_COMPILER_TARGET "x86_64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_CXX_COMPILER_TARGET "x86_64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_Swift_COMPILER_TARGET "x86_64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") +set(CMAKE_ASM_COMPILER_TARGET "x86_64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simulator" CACHE STRING "") + +set(SwiftRuntime_ARCH_SUBDIR x86_64 CACHE STRING "") +set(SwiftRuntime_PLATFORM_SUBDIR iphonesimulator CACHE STRING "") + +include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") From 5e39a6120a0f5227c44efaad3d2e40e70541ac6c Mon Sep 17 00:00:00 2001 From: Eric Miotto Date: Mon, 6 Oct 2025 14:56:23 -0700 Subject: [PATCH 2/2] Remove non existing flags in some vendor caches --- .../Distributed/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake | 1 - .../Observation/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake | 1 - 2 files changed, 2 deletions(-) diff --git a/Runtimes/Supplemental/Distributed/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake b/Runtimes/Supplemental/Distributed/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake index 7ba1f319b733f..762b7e6553f5a 100644 --- a/Runtimes/Supplemental/Distributed/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake +++ b/Runtimes/Supplemental/Distributed/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake @@ -9,6 +9,5 @@ set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARG set(SwiftDistributed_ARCH_SUBDIR arm64 CACHE STRING "") set(SwiftDistributed_PLATFORM_SUBDIR freestanding CACHE STRING "") set(CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "") -set(SwiftDistributed_SINGLE_THREADED_MODE YES CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake") diff --git a/Runtimes/Supplemental/Observation/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake b/Runtimes/Supplemental/Observation/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake index c8d88765e5610..374e0189182d4 100644 --- a/Runtimes/Supplemental/Observation/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake +++ b/Runtimes/Supplemental/Observation/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake @@ -9,6 +9,5 @@ set(CMAKE_Swift_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARG set(SwiftObservation_ARCH_SUBDIR arm64 CACHE STRING "") set(SwiftObservation_PLATFORM_SUBDIR freestanding CACHE STRING "") set(CMAKE_BUILD_TYPE MinSizeRel CACHE STRING "") -set(SwiftObservation_SINGLE_THREADED_MODE YES CACHE BOOL "") include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")