From 80f767cb3c2bf073b71ba697385cdf9acc6b64fa Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Thu, 4 Jul 2024 01:13:35 +0530 Subject: [PATCH 1/2] Import new Android overlay --- products/llbuildSwift/BuildDBBindings.swift | 2 ++ products/llbuildSwift/BuildKey.swift | 2 ++ products/llbuildSwift/BuildSystemBindings.swift | 4 +++- products/llbuildSwift/BuildValue.swift | 2 ++ products/llbuildSwift/Internals.swift | 2 ++ 5 files changed, 11 insertions(+), 1 deletion(-) diff --git a/products/llbuildSwift/BuildDBBindings.swift b/products/llbuildSwift/BuildDBBindings.swift index db8a9b72..78652cc7 100644 --- a/products/llbuildSwift/BuildDBBindings.swift +++ b/products/llbuildSwift/BuildDBBindings.swift @@ -17,6 +17,8 @@ import WinSDK import Glibc #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #else #error("Missing libc or equivalent") #endif diff --git a/products/llbuildSwift/BuildKey.swift b/products/llbuildSwift/BuildKey.swift index 1d89c534..a59e895a 100644 --- a/products/llbuildSwift/BuildKey.swift +++ b/products/llbuildSwift/BuildKey.swift @@ -17,6 +17,8 @@ import WinSDK import Glibc #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #else #error("Missing libc or equivalent") #endif diff --git a/products/llbuildSwift/BuildSystemBindings.swift b/products/llbuildSwift/BuildSystemBindings.swift index 2ee1854b..2708dd66 100644 --- a/products/llbuildSwift/BuildSystemBindings.swift +++ b/products/llbuildSwift/BuildSystemBindings.swift @@ -17,6 +17,8 @@ import WinSDK import Glibc #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #else #error("Missing libc or equivalent") #endif @@ -1235,7 +1237,7 @@ public final class BuildSystem { #elseif os(Windows) info.pointee.mod_time.seconds = UInt64(s.st_mtime) info.pointee.mod_time.nanoseconds = 0 - #elseif canImport(Glibc) || canImport(Musl) + #elseif canImport(Glibc) || canImport(Musl) || canImport(Android) info.pointee.mod_time.seconds = UInt64(s.st_mtim.tv_sec) info.pointee.mod_time.nanoseconds = UInt64(s.st_mtim.tv_nsec) #else diff --git a/products/llbuildSwift/BuildValue.swift b/products/llbuildSwift/BuildValue.swift index 2caa5947..b2af480f 100644 --- a/products/llbuildSwift/BuildValue.swift +++ b/products/llbuildSwift/BuildValue.swift @@ -17,6 +17,8 @@ import WinSDK import Glibc #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #else #error("Missing libc or equivalent") #endif diff --git a/products/llbuildSwift/Internals.swift b/products/llbuildSwift/Internals.swift index 4e134288..3f5c4fe4 100644 --- a/products/llbuildSwift/Internals.swift +++ b/products/llbuildSwift/Internals.swift @@ -17,6 +17,8 @@ import WinSDK import Glibc #elseif canImport(Musl) import Musl +#elseif canImport(Android) +import Android #else #error("Missing libc or equivalent") #endif From 51fa1753a0e520b1ea844ae14b8974c1bb947cdb Mon Sep 17 00:00:00 2001 From: Finagolfin Date: Mon, 8 Jul 2024 18:44:42 +0530 Subject: [PATCH 2/2] Import new Bionic module from Android overlay instead --- products/llbuildSwift/BuildDBBindings.swift | 4 ++-- products/llbuildSwift/BuildKey.swift | 4 ++-- products/llbuildSwift/BuildSystemBindings.swift | 6 +++--- products/llbuildSwift/BuildValue.swift | 4 ++-- products/llbuildSwift/Internals.swift | 4 ++-- 5 files changed, 11 insertions(+), 11 deletions(-) diff --git a/products/llbuildSwift/BuildDBBindings.swift b/products/llbuildSwift/BuildDBBindings.swift index 78652cc7..e5e0a91e 100644 --- a/products/llbuildSwift/BuildDBBindings.swift +++ b/products/llbuildSwift/BuildDBBindings.swift @@ -17,8 +17,8 @@ import WinSDK import Glibc #elseif canImport(Musl) import Musl -#elseif canImport(Android) -import Android +#elseif canImport(Bionic) +import Bionic #else #error("Missing libc or equivalent") #endif diff --git a/products/llbuildSwift/BuildKey.swift b/products/llbuildSwift/BuildKey.swift index a59e895a..c3053eec 100644 --- a/products/llbuildSwift/BuildKey.swift +++ b/products/llbuildSwift/BuildKey.swift @@ -17,8 +17,8 @@ import WinSDK import Glibc #elseif canImport(Musl) import Musl -#elseif canImport(Android) -import Android +#elseif canImport(Bionic) +import Bionic #else #error("Missing libc or equivalent") #endif diff --git a/products/llbuildSwift/BuildSystemBindings.swift b/products/llbuildSwift/BuildSystemBindings.swift index 2708dd66..d91f29e4 100644 --- a/products/llbuildSwift/BuildSystemBindings.swift +++ b/products/llbuildSwift/BuildSystemBindings.swift @@ -17,8 +17,8 @@ import WinSDK import Glibc #elseif canImport(Musl) import Musl -#elseif canImport(Android) -import Android +#elseif canImport(Bionic) +import Bionic #else #error("Missing libc or equivalent") #endif @@ -1237,7 +1237,7 @@ public final class BuildSystem { #elseif os(Windows) info.pointee.mod_time.seconds = UInt64(s.st_mtime) info.pointee.mod_time.nanoseconds = 0 - #elseif canImport(Glibc) || canImport(Musl) || canImport(Android) + #elseif canImport(Glibc) || canImport(Musl) || canImport(Bionic) info.pointee.mod_time.seconds = UInt64(s.st_mtim.tv_sec) info.pointee.mod_time.nanoseconds = UInt64(s.st_mtim.tv_nsec) #else diff --git a/products/llbuildSwift/BuildValue.swift b/products/llbuildSwift/BuildValue.swift index b2af480f..c990d4b9 100644 --- a/products/llbuildSwift/BuildValue.swift +++ b/products/llbuildSwift/BuildValue.swift @@ -17,8 +17,8 @@ import WinSDK import Glibc #elseif canImport(Musl) import Musl -#elseif canImport(Android) -import Android +#elseif canImport(Bionic) +import Bionic #else #error("Missing libc or equivalent") #endif diff --git a/products/llbuildSwift/Internals.swift b/products/llbuildSwift/Internals.swift index 3f5c4fe4..3c59d513 100644 --- a/products/llbuildSwift/Internals.swift +++ b/products/llbuildSwift/Internals.swift @@ -17,8 +17,8 @@ import WinSDK import Glibc #elseif canImport(Musl) import Musl -#elseif canImport(Android) -import Android +#elseif canImport(Bionic) +import Bionic #else #error("Missing libc or equivalent") #endif