Skip to content

Fix the SwiftPM build on Android #954

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Nov 17, 2024
Merged

Fix the SwiftPM build on Android #954

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions Package.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,21 @@ let embeddedSqliteCondition: TargetDependencyCondition? = {
if useEmbeddedSqlite {
return nil
}
return .when(platforms: [.windows])
return .when(platforms: [.windows, .android])
}()

let externalSqliteLibraries: [LinkerSetting] = {
if useEmbeddedSqlite {
return []
}
return [.linkedLibrary("sqlite3", .when(platforms: [.macOS, .iOS, .tvOS, .watchOS, .visionOS, .macCatalyst, .linux, .android]))]
return [.linkedLibrary("sqlite3", .when(platforms: [.macOS, .iOS, .tvOS, .watchOS, .visionOS, .macCatalyst, .linux]))]
}()

let terminfoLibraries: [LinkerSetting] = {
if !useTerminfo {
return []
}
return [.linkedLibrary("ncurses", .when(platforms: [.linux, .macOS, .android]))]
return [.linkedLibrary("ncurses", .when(platforms: [.linux, .macOS]))]
}()

let package = Package(
Expand Down Expand Up @@ -98,7 +98,10 @@ let package = Package(
.target(
name: "llbuildBasic",
dependencies: ["llvmSupport"],
path: "lib/Basic"
path: "lib/Basic",
linkerSettings: [
.linkedLibrary("android-spawn", .when(platforms: [.android]))
]
),
.target(
name: "llbuildCore",
Expand Down
2 changes: 1 addition & 1 deletion include/llvm/Config/config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -267,7 +267,7 @@
#define HAVE_SYS_TYPES_H 1

/* Define if the setupterm() function is supported this platform. */
#if (defined(__APPLE__) && TARGET_OS_IPHONE) || defined(LLBUILD_NO_TERMINFO)
#if (defined(__APPLE__) && TARGET_OS_IPHONE) || defined(__ANDROID__) || defined(LLBUILD_NO_TERMINFO)
#undef HAVE_TERMINFO
#else
#define HAVE_TERMINFO 1
Expand Down