Merge pull request #73 from euanh/do-not-build-demangle-after-5.9

Do not build Demangle on Swift 5.9 or above
swift-server · Jun 17, 2024 · 7277ee0 · 7277ee0
2 parents 525d450 + d4f33e7
commit 7277ee0
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/Sources/Backtrace/Demangle.swift b/Sources/Backtrace/Demangle.swift
@@ -12,6 +12,10 @@
 //
 //===----------------------------------------------------------------------===//
 
+// Swift 5.9 has its own built-in backtracing support in the runtime;
+// we don't want to activate this library if we're using 5.9 or above.
+#if !(swift(>=5.9) && !os(Windows))
+
 #if os(Linux)
 import Glibc
 #elseif os(Windows)
@@ -55,3 +59,5 @@ internal func _stdlib_demangleName(_ mangledName: String) -> String {
  }
 }
 #endif
+
+#endif
diff --git a/Sources/Sample/main.swift b/Sources/Sample/main.swift
@@ -15,8 +15,10 @@
 import Backtrace
 #if canImport(Darwin)
 import Darwin
-#elseif os(Linux)
+#elseif canImport(Glibc)
 import Glibc
+#elseif canImport(Musl)
+import Musl
 #endif
 
 #if swift(<5.9) || os(Windows)