Merge pull request swiftlang#78453 from etcwilde/ewilde/stdlib-rebuild-has-filesystem

etcwilde · web-flow · commit 51b3ffdab120 · 2025-01-08T09:17:20.000-08:00
[cmake] Hook up `SWIFT_STDLIB_HAS_FILESYSTEM` macro
diff --git a/Runtimes/Core/CMakeLists.txt b/Runtimes/Core/CMakeLists.txt
@@ -96,6 +96,7 @@ defaulted_option(SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT "Add symbols for runtim
 defaulted_option(SwiftCore_ENABLE_STDLIB_TRACING "Enable tracing in the runtime. Assumes the presence of os_log(3) and the os_signpost(3) API.")
 option(SwiftCore_ENABLE_UNICODE_DATA "Include unicode data in Swift runtimes" ON)
 option(SwiftCore_ENABLE_SHORT_MANGLING_LOOKUPS "Build with fast-path context descriptor lookups based on well-known short manglings." ON)
+option(SwiftCore_ENABLE_FILESYSTEM_SUPPORT "Build for systems that have a filesystem" ON)
 
 defaulted_option(SwiftCore_ENABLE_BACKTRACING "Enable backtracing runtime support")
 defaulted_set(SwiftCore_BACKTRACER_PATH STRING "Set a fixed path to the Swift backtracer")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/apple-common.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/apple-common.cmake
@@ -11,6 +11,7 @@ set(SwiftCore_ENABLE_TYPE_PRINTING ON CACHE BOOL "")
 set(SwiftCore_ENABLE_VECTOR_TYPES ON CACHE BOOL "")
 set(SwiftCore_ENABLE_RUNTIME_FUNCTION_COUNTERS ON CACHE BOOL "")
 set(SwiftCore_ENABLE_BACKDEPLOYMENT_SUPPORT ON CACHE BOOL "")
+set(SwiftCore_ENABLE_FILESYSTEM_SUPPORT ON CACHE BOOL "")
 
 set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O3 -gline-tables-only -DNDEBUG" CACHE STRING "")
 set(CMAKE_C_FLAGS_RELWITHDEBINFO "-O3 -gline-tables-only -DNDEBUG" CACHE STRING "")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-AppleTVOS-simulator.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-AppleTVOS-simulator.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-simu
 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(SwiftCore_ARCH_SUBDIR arm64)
+set(SwiftCore_PLATFORM_SUBDIR appletvsimulator)
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-AppleTVOS.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-AppleTVOS.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CAC
 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(SwiftCore_ARCH_SUBDIR arm64)
+set(SwiftCore_PLATFORM_SUBDIR appletvos)
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-BridgeOS.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64-apple-bridgeos${CMAKE_OSX_DEPLOYMENT_TARGET}"
 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(SwiftCore_ARCH_SUBDIR arm64)
+set(SwiftCore_PLATFORM_SUBDIR freestanding)
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-WatchOS-simulator.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-WatchOS-simulator.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-s
 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(SwiftCore_ARCH_SUBDIR arm64 CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR watchsimulator CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-XROS-simulator.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-XROS-simulator.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-simu
 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(SwiftCore_ARCH_SUBDIR arm64 CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR xrsimulator CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-iPhoneOS-simulator.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-iPhoneOS-simulator.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simul
 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(SwiftCore_ARCH_SUBDIR arm64 CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR iphonesimulator CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-iPhoneOS.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64-iPhoneOS.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}" CACH
 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(SwiftCore_ARCH_SUBDIR arm64 CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR iphoneos CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64_32-WatchOS.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64_32-WatchOS.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64_32-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET
 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(SwiftCore_ARCH_SUBDIR arm64_32 CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR watchos CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-AppleTVOS.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-AppleTVOS.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64e-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}" CA
 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(SwiftCore_ARCH_SUBDIR arm64e)
+set(SwiftCore_PLATFORM_SUBDIR appletvos)
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-MacOSX.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-MacOSX.cmake
@@ -6,6 +6,9 @@ set(CMAKE_C_COMPILER_TARGET "arm64e-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}"
 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(SwiftCore_ARCH_SUBDIR arm64e CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR macosx CACHE STRING "")
+
 list(APPEND CMAKE_C_FLAGS "-darwin-target-variant" "arm64e-apple-ios13.1-macabi")
 list(APPEND CMAKE_CXX_FLAGS "-darwin-target-variant" "arm64e-apple-ios13.1-macabi")
 list(APPEND CMAKE_Swift_FLAGS "-target-variant" "arm64e-apple-ios13.1-macabi")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-WatchOS.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-WatchOS.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64e-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}"
 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(SwiftCore_ARCH_SUBDIR arm64e CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR watchos CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-XROS.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-XROS.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64e-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}" CA
 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(SwiftCore_ARCH_SUBDIR arm64e CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR xros CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-iPhoneOS.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/arm64e-iPhoneOS.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "arm64e-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}" CAC
 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(SwiftCore_ARCH_SUBDIR arm64e CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR iphoneos CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-AppleTVOS-simulator.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-AppleTVOS-simulator.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "x86_64-apple-tvos${CMAKE_OSX_DEPLOYMENT_TARGET}-sim
 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(SwiftCore_ARCH_SUBDIR x86_64)
+set(SwiftCore_PLATFORM_SUBDIR appletvsimulator)
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-MacOSX.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-MacOSX.cmake
@@ -6,6 +6,9 @@ set(CMAKE_C_COMPILER_TARGET "x86_64-apple-macosx${CMAKE_OSX_DEPLOYMENT_TARGET}"
 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(SwiftCore_ARCH_SUBDIR x86_64 CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR macosx CACHE STRING "")
+
 list(APPEND CMAKE_C_FLAGS "-darwin-target-variant" "x86_64-apple-ios13.1-macabi")
 list(APPEND CMAKE_CXX_FLAGS "-darwin-target-variant" "x86_64-apple-ios13.1-macabi")
 list(APPEND CMAKE_Swift_FLAGS "-target-variant" "x86_64-apple-ios13.1-macabi")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-WatchOS-simulator.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-WatchOS-simulator.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "x86_64-apple-watchos${CMAKE_OSX_DEPLOYMENT_TARGET}-
 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(SwiftCore_ARCH_SUBDIR x86_64 CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR watchsimulator CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-XROS-simulator.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-XROS-simulator.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "x86_64-apple-xros${CMAKE_OSX_DEPLOYMENT_TARGET}-sim
 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(SwiftCore_ARCH_SUBDIR x86_64 CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR xrsimulator CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-iPhoneOS-simulator.cmake b/Runtimes/Core/cmake/caches/Vendors/Apple/x86_64-iPhoneOS-simulator.cmake
@@ -6,4 +6,7 @@ set(CMAKE_C_COMPILER_TARGET "x86_64-apple-ios${CMAKE_OSX_DEPLOYMENT_TARGET}-simu
 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(SwiftCore_ARCH_SUBDIR x86_64 CACHE STRING "")
+set(SwiftCore_PLATFORM_SUBDIR iphonesimulator CACHE STRING "")
+
 include("${CMAKE_CURRENT_LIST_DIR}/apple-common.cmake")
diff --git a/Runtimes/Core/runtime/CMakeLists.txt b/Runtimes/Core/runtime/CMakeLists.txt
@@ -72,6 +72,15 @@ if(SwiftCore_ENABLE_RUNTIME_LEAK_CHECKER)
     Leaks.mm)
 endif()
 
+# runtime/Paths.cpp uses `SWIFT_ARCH` and `SWIFT_LIB_SUBDIR` to find the
+# subdirectory under `libexec` in which to find the backtracer.
+# Fail the configuration if it isn't set appropriately.
+# TODO: In the future, we might consider moving the backtracer up to
+# `libexec/swift` and drop the platform/architecture specific subdirectories
+if(SwiftCore_ENABLE_FILESYSTEM_SUPPORT AND (NOT SwiftCore_ARCH_SUBDIR OR NOT SwiftCore_PLATFORM_SUBDIR))
+  message(SEND_ERROR "Filesystem support requires setting `SwiftCore_ARCH_SUBDIR` and `SwiftCore_PLATFORM_SUBDIR`")
+endif()
+
 # TODO: Probably worth considering putting half of these in a RuntimeConfig.h.in
 #       file rather than pushing them through macro flags.
 target_compile_definitions(swiftRuntime
@@ -87,7 +96,10 @@ target_compile_definitions(swiftRuntime
     $<$<BOOL:${SwiftCore_ENABLE_SHORT_MANGLING_LOOKUPS}>:-DSWIFT_STDLIB_SHORT_MANGLING_LOOKUPS>
     $<$<BOOL:${SwiftCore_HAS_ASL}>:-DSWIFT_STDLIB_HAS_ASL>
     $<$<BOOL:${SwiftCore_HAS_DLADDR}>:-DSWIFT_STDLIB_HAS_DLADDR>
-    $<$<BOOL:${SwiftCore_HAS_DLSYM}>:-DSWIFT_STDLIB_HAS_DLSYM>)
+    $<$<BOOL:${SwiftCore_HAS_DLSYM}>:-DSWIFT_STDLIB_HAS_DLSYM>
+    $<$<BOOL:${SwiftCore_ENABLE_FILESYSTEM_SUPPORT}>:-DSWIFT_STDLIB_HAS_FILESYSTEM>
+    $<$<AND:$<BOOL:${SwiftCore_ENABLE_FILESYSTEM_SUPPORT}>,$<COMPILE_LANGUAGE:C,CXX>>:-DSWIFT_ARCH="${SwiftCore_ARCH_SUBDIR}">
+    $<$<AND:$<BOOL:${SwiftCore_ENABLE_FILESYSTEM_SUPPORT}>,$<COMPILE_LANGUAGE:C,CXX>>:-DSWIFT_LIB_SUBDIR="${SwiftCore_PLATFORM_SUBDIR}">)
 
 target_include_directories(swiftRuntime PRIVATE
   "${PROJECT_BINARY_DIR}/include"
