From be3f4e6329f0f4eac30811502ee3c0b387fa08be Mon Sep 17 00:00:00 2001 From: Sebastien Stormacq Date: Wed, 19 Jun 2024 18:05:57 +0200 Subject: [PATCH] allow compilation with the static linux sdk (musl) --- Package.swift | 4 ++-- Plugins/AWSLambdaPackager/Plugin.swift | 10 +++++++++- Sources/AWSLambdaRuntimeCore/Lambda.swift | 10 ++++++++-- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/Package.swift b/Package.swift index 1b47e1d0..b1bfd98e 100644 --- a/Package.swift +++ b/Package.swift @@ -21,8 +21,8 @@ let package = Package( .library(name: "AWSLambdaTesting", targets: ["AWSLambdaTesting"]), ], dependencies: [ - .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.43.1")), - .package(url: "https://github.com/apple/swift-log.git", .upToNextMajor(from: "1.4.2")), + .package(url: "https://github.com/apple/swift-nio.git", .upToNextMajor(from: "2.67.0")), + .package(url: "https://github.com/apple/swift-log.git", .upToNextMajor(from: "1.5.4")), .package(url: "https://github.com/apple/swift-docc-plugin", from: "1.0.0"), ], targets: [ diff --git a/Plugins/AWSLambdaPackager/Plugin.swift b/Plugins/AWSLambdaPackager/Plugin.swift index 3a8c8b20..fd6221c0 100644 --- a/Plugins/AWSLambdaPackager/Plugin.swift +++ b/Plugins/AWSLambdaPackager/Plugin.swift @@ -16,8 +16,16 @@ import Dispatch import Foundation import PackagePlugin -#if canImport(Glibc) +#if os(macOS) +import Darwin +#elseif canImport(Glibc) import Glibc +#elseif canImport(Musl) +import Musl +#elseif os(Windows) +import ucrt +#else +#error("Unsupported platform") #endif @main diff --git a/Sources/AWSLambdaRuntimeCore/Lambda.swift b/Sources/AWSLambdaRuntimeCore/Lambda.swift index 67b45cd8..f499d581 100644 --- a/Sources/AWSLambdaRuntimeCore/Lambda.swift +++ b/Sources/AWSLambdaRuntimeCore/Lambda.swift @@ -12,10 +12,16 @@ // //===----------------------------------------------------------------------===// -#if os(Linux) +#if os(macOS) +import Darwin.C +#elseif canImport(Glibc) import Glibc +#elseif canImport(Musl) +import Musl +#elseif os(Windows) +import ucrt #else -import Darwin.C +#error("Unsupported platform") #endif #if swift(<5.9)