correct build flags and tls access

Author: phausler

stdlib/public/Observation/Sources/Observation/CMakeLists.txt

@@ -12,8 +12,12 @@
 
 set(SWIFT_OBSERVATION_SWIFT_FLAGS)
 
+set(SWIFT_HOST_LIBRARIES_SUBDIRECTORY "swift/host")
+
 list(APPEND SWIFT_OBSERVATION_SWIFT_FLAGS
-  "-enable-experimental-feature Macros")
+  "-enable-experimental-feature" "Macros"
+  "-load-plugin-library"
+  ${CMAKE_BINARY_DIR}/lib/${SWIFT_HOST_LIBRARIES_SUBDIRECTORY})
 
 add_swift_target_library(swiftObservation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS_STDLIB
   KeyPaths.swift
@@ -31,7 +35,7 @@ add_swift_target_library(swiftObservation ${SWIFT_STDLIB_LIBRARY_BUILD_TYPES} IS
   SWIFT_COMPILE_FLAGS
     ${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}
     ${SWIFT_OBSERVATION_SWIFT_FLAGS}
-  SWIFT_MODULE_DEPENDS _Concurrency
+  SWIFT_MODULE_DEPENDS _Concurrency ObservationMacros
   INSTALL_IN_COMPONENT stdlib
 
   MACCATALYST_BUILD_FLAVOR "zippered"

stdlib/public/Observation/Sources/Observation/Macros.swift

@@ -9,11 +9,13 @@
 //
 //===----------------------------------------------------------------------===//
 
+#if compiler(>=5.8) && hasAttribute(attached)
 @available(SwiftStdlib 5.9, *)
 @attached(member)
 @attached(memberAttribute)
 public macro Observable() = #externalMacro(module: "ObservationMacros", type: "ObservableMacro")
 
 @available(SwiftStdlib 5.9, *)
 @attached(accessor)
-public macro ObservableProperty() = #externalMacro(module: "ObservationMacros", type: "ObservablePropertyMacro")
+public macro ObservableProperty() = #externalMacro(module: "ObservationMacros", type: "ObservablePropertyMacro")
+#endif

stdlib/public/Observation/Sources/Observation/ThreadLocal.cpp

@@ -14,7 +14,7 @@
 #include "swift/Runtime/Once.h"
 #include "swift/Threading/ThreadLocalStorage.h"
 
-static SWIFT_THREAD_LOCAL_TYPE(void *, tls_key::observation_transaction) Value;
+static SWIFT_THREAD_LOCAL_TYPE(void *, swift::tls_key::observation_transaction) Value;
 
 extern "C" SWIFT_CC(swift)
 void *_swift_observation_tls_get() {