Support compiling against Musl (#3188)

Vapor already makes some provision for compiling against Musl in the RFC1123 implementation, where `Glibc` is not assumed and is imported conditionally alongside a conditional import of `Musl`. However, there are a couple of other places where `Glibc` is still assumed when compiling for Linux. This patch replaces these imports with the same `#if canImport(...)` pattern. Co-authored-by: Tim Condon <0xTim@users.noreply.github.com>
vapor · May 12, 2024 · d9fa0d3 · d9fa0d3
1 parent 8353aed
commit d9fa0d3
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/Sources/Vapor/Utilities/DirectoryConfiguration.swift b/Sources/Vapor/Utilities/DirectoryConfiguration.swift
@@ -1,5 +1,7 @@
-#if os(Linux)
+#if canImport(Glibc)
 import Glibc
+#elseif canImport(Musl)
+import Musl
 #else
 import Darwin.C
 #endif

diff --git a/Sources/Vapor/Utilities/DotEnv.swift b/Sources/Vapor/Utilities/DotEnv.swift
@@ -1,5 +1,7 @@
-#if os(Linux)
+#if canImport(Glibc)
 import Glibc
+#elseif canImport(Musl)
+import Musl
 #else
 import Darwin
 #endif