Fix the Android build #492
Conversation
Sources/TSCBasic/misc.swift
Outdated
| @@ -328,6 +328,18 @@ extension SystemError: CustomStringConvertible { | |||
| while cap <= 16 * 1024 { | |||
| var buf = [Int8](repeating: 0, count: cap) | |||
| let err = TSCLibc.strerror_r(errno, &buf, buf.count) | |||
| #if os(Android) | |||
There was a problem hiding this comment.
@finagolfin Does this look reasonable?
|
@swift-ci please smoke test |
|
What is this about, are you getting compilation issues all of a sudden? Because my Android CI just cross-compiled the latest Nov. 14 trunk snapshot of SwiftPM and TSC yesterday without a problem, after applying these basic patches that were mostly just upstreamed with your approval. I didn't know what to make of that linked Android overlay patch for TSC, as I didn't need it when building natively on Android last month or when cross-compiling the latest Termux 6.1 toolchain. |
Sources/TSCBasic/misc.swift
Outdated
| @@ -328,6 +328,18 @@ extension SystemError: CustomStringConvertible { | |||
| while cap <= 16 * 1024 { | |||
| var buf = [Int8](repeating: 0, count: cap) | |||
| let err = TSCLibc.strerror_r(errno, &buf, buf.count) | |||
| #if os(Android) | |||
| if String(cString: err) == strerror(EINVAL) { | |||
| return "Unknown error \(errno)" | |||
There was a problem hiding this comment.
Is this an unknown error or is it as the name suggests, an invalid parameter?
Sources/TSCBasic/misc.swift
Outdated
| cap *= 2 | ||
| continue | ||
| } | ||
| if err != nil { |
Yeah, Android builds are using the GNU-specific definition of strerror_r so I got a compilation failure here. This was with the Swift 6.0.2 release and your Android SDK from https://github.com/finagolfin/swift-android-sdk/releases/tag/6.0.2, with top-of-tree main branch of SwiftTSC. Using: /Library/Developer/Toolchains/swift-6.0.2-RELEASE.xctoolchain/usr/bin/swift build --swift-sdk aarch64-unknown-linux-android24 |
OK, this is a well-known issue with the Android build of this repo, which is remedied by passing in Unfortunately, while this SwiftPM package manifest can add such defines easily, it could not undefine them without resorting to unsafe flags: maybe that should be fixed in SwiftPM. After adding those flags and my linked Android overlay patch for this repo, I was able to cross-compile this repo for Android, then adding If you have any ideas on how to better handle these matters, I'm all ears. |
|
Do you know where that |
jakepetroules
force-pushed
the
android
branch
from
12693e8 to
8d2b752
Compare
|
I reverted the misc.swift changes for now, but I think we do still need the added import in Tracing.swift as I get a failure to find |
|
@swift-ci please smoke test |
The Swift compiler started defining it for Android for some extra math function declarations six years ago. We briefly discussed removing it years ago, but figured there were likely already Swift codebases relying on it, so left it in. |
|
@swift-ci please smoke test |
|
Looks reasonable, especially now that it's just adding the missing import |
|
@swift-ci please test macOS |
|
@swift-ci please test Linux |
|
Here's a better attempt at the strerror thing which allows the package build to work regardless of whether _GNU_SOURCE is given on the command line: #497 |
No description provided.