Skip to content

Commit 2230562

Browse files
authored
Revert "Update manifest version to 5.0"
This reverts commit be6f997.
1 parent be6f997 commit 2230562

File tree

2 files changed

+15
-5
lines changed

2 files changed

+15
-5
lines changed

Package.swift

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,13 @@
1-
// swift-tools-version:5.0
1+
// swift-tools-version:4.0
22

33
// This file defines Swift package manager support for llbuild. See:
44
// https://github.com/apple/swift-package-manager/tree/master/Documentation
5+
//
6+
// You can build using:
7+
//
8+
// ```shell
9+
// swift build -Xlinker -lsqlite3 -Xlinker -lncurses $(utils/generate-version-h.sh)
10+
// ```
511

612
import PackageDescription
713

@@ -55,8 +61,7 @@ let package = Package(
5561
.target(
5662
name: "llbuildCore",
5763
dependencies: ["llbuildBasic"],
58-
path: "lib/Core",
59-
linkerSettings: [.linkedLibrary("sqlite3")]
64+
path: "lib/Core"
6065
),
6166
.target(
6267
name: "llbuildBuildSystem",
@@ -112,8 +117,7 @@ let package = Package(
112117

113118
.target(
114119
name: "llvmSupport",
115-
path: "lib/llvm/Support",
116-
linkerSettings: [.linkedLibrary("ncurses")]
120+
path: "lib/llvm/Support"
117121
),
118122
],
119123
cxxLanguageStandard: .cxx14
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
11
module "llbuild" {
22
umbrella header "llbuild/llbuild.h"
3+
4+
// Hack: This allows the clients to autolink these system libraries when
5+
// building using SwiftPM. We should declare this in the Package.swift
6+
// manifest file once SwiftPM exposes an API for it.
7+
link "sqlite3"
8+
link "ncurses"
39
}

0 commit comments

Comments
 (0)