Add support for Musl (#616)

soto-project · Oct 13, 2024 · 2984812 · 2984812
1 parent 48a89ed
commit 2984812
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 15 deletions.
diff --git a/Sources/SotoCore/Credential/ConfigFileLoader.swift b/Sources/SotoCore/Credential/ConfigFileLoader.swift
@@ -17,11 +17,6 @@ import INIParser
 import Logging
 import NIOCore
 import NIOPosix
-#if os(Linux)
-import Glibc
-#else
-import Foundation.NSString
-#endif
 
 /// Load settings from AWS credentials and profile configuration files
 /// https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-files.html

diff --git a/Sources/SotoCore/Doc/Environment.swift b/Sources/SotoCore/Doc/Environment.swift
@@ -12,14 +12,18 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if os(Linux)
+#if canImport(Glibc)
 import Glibc
-#else
+#elseif canImport(Musl)
+import Musl
+#elseif canImport(Darwin)
 import Darwin.C
+#else
+#error("Unsupported platform")
 #endif
 
-internal enum Environment {
-    internal static subscript(_ name: String) -> String? {
+enum Environment {
+    static subscript(_ name: String) -> String? {
         guard let value = getenv(name) else {
             return nil
         }

diff --git a/Sources/SotoTestUtils/Environment.swift b/Sources/SotoTestUtils/Environment.swift
@@ -12,10 +12,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#if os(Linux)
+#if canImport(Glibc)
 import Glibc
-#else
+#elseif canImport(Musl)
+import Musl
+#elseif canImport(Darwin)
 import Darwin.C
+#else
+#error("Unsupported platform")
 #endif
 
 internal enum Environment {

diff --git a/Sources/SotoXML/Expat.swift b/Sources/SotoXML/Expat.swift
@@ -18,10 +18,14 @@
 //  Licensed under Apache License v2.0 http://www.apache.org/licenses/LICENSE-2.0.html
 //
 
-#if os(Linux)
+#if canImport(Glibc)
 import Glibc
-#else
+#elseif canImport(Musl)
+import Musl
+#elseif canImport(Darwin)
 import Darwin.C
+#else
+#error("Unsupported platform")
 #endif
 
 @_implementationOnly import CSotoExpat

diff --git a/Tests/SotoCoreTests/Credential/StaticCredential+EnvironmentTests.swift b/Tests/SotoCoreTests/Credential/StaticCredential+EnvironmentTests.swift
@@ -13,10 +13,14 @@
 //===----------------------------------------------------------------------===//
 
 import XCTest
-#if os(Linux)
+#if canImport(Glibc)
 import Glibc
+#elseif canImport(Musl)
+import Musl
+#elseif canImport(Darwin)
+import Darwin.C
 #else
-import Darwin
+#error("Unsupported platform")
 #endif
 @testable import SotoCore