From 052a1ae2fe4d9e3dbb54e5213ee945f245fa0084 Mon Sep 17 00:00:00 2001 From: Alastair Houghton Date: Wed, 12 Nov 2025 13:03:31 +0000 Subject: [PATCH 1/2] [Observation] Add missing dependencies. There should be additional dependencies listed for Observation, as it's importing various platform modules. --- .../Observation/Sources/Observation/CMakeLists.txt | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/stdlib/public/Observation/Sources/Observation/CMakeLists.txt b/stdlib/public/Observation/Sources/Observation/CMakeLists.txt index c1124141d1ad5..216df76cd92d9 100644 --- a/stdlib/public/Observation/Sources/Observation/CMakeLists.txt +++ b/stdlib/public/Observation/Sources/Observation/CMakeLists.txt @@ -32,6 +32,15 @@ add_swift_target_library(swiftObservation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}" SWIFT_MODULE_DEPENDS _Concurrency + SWIFT_MODULE_DEPENDS_ANDROID Bionic + SWIFT_MODULE_DEPENDS_LINUX Glibc + SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl + SWIFT_MODULE_DEPENDS_FREEBSD Glibc + SWIFT_MODULE_DEPENDS_OPENBSD Glibc + SWIFT_MODULE_DEPENDS_CYGWIN Glibc + SWIFT_MODULE_DEPENDS_HAIKU Glibc + SWIFT_MODULE_DEPENDS_WINDOWS WinSDK + INSTALL_IN_COMPONENT stdlib MACCATALYST_BUILD_FLAVOR "zippered" From 8172fde478cad39c1bd032bd6a6d780b75b7cdc9 Mon Sep 17 00:00:00 2001 From: Alastair Houghton Date: Wed, 12 Nov 2025 16:54:10 +0000 Subject: [PATCH 2/2] [Observation] We should be importing `Android`, not `Bionic`. Apparently the right module is `Android`, not `Bionic`. The latter is the Clang module, with no Swift overlay. --- stdlib/public/Observation/Sources/Observation/CMakeLists.txt | 2 +- stdlib/public/Observation/Sources/Observation/Locking.swift | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/stdlib/public/Observation/Sources/Observation/CMakeLists.txt b/stdlib/public/Observation/Sources/Observation/CMakeLists.txt index 216df76cd92d9..cdd12cc7abbc3 100644 --- a/stdlib/public/Observation/Sources/Observation/CMakeLists.txt +++ b/stdlib/public/Observation/Sources/Observation/CMakeLists.txt @@ -32,7 +32,7 @@ add_swift_target_library(swiftObservation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}" SWIFT_MODULE_DEPENDS _Concurrency - SWIFT_MODULE_DEPENDS_ANDROID Bionic + SWIFT_MODULE_DEPENDS_ANDROID Android SWIFT_MODULE_DEPENDS_LINUX Glibc SWIFT_MODULE_DEPENDS_LINUX_STATIC Musl SWIFT_MODULE_DEPENDS_FREEBSD Glibc diff --git a/stdlib/public/Observation/Sources/Observation/Locking.swift b/stdlib/public/Observation/Sources/Observation/Locking.swift index c92c88de6cc2c..6171465a2eceb 100644 --- a/stdlib/public/Observation/Sources/Observation/Locking.swift +++ b/stdlib/public/Observation/Sources/Observation/Locking.swift @@ -23,8 +23,8 @@ import Glibc import Musl #elseif canImport(WinSDK) import WinSDK -#elseif canImport(Bionic) -import Bionic +#elseif canImport(Android) +import Android #elseif arch(wasm32) #else #error("Unsupported platform")