Skip to content

Commit fe4167c

Browse files
authored
Merge pull request #185 from CodaFi/update-for-real
Update to Swift 5
2 parents d9d7464 + 2ca7ad9 commit fe4167c

File tree

2 files changed

+4
-10
lines changed

2 files changed

+4
-10
lines changed

.travis.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ matrix:
1212
- brew install llvm
1313
- sudo swift utils/make-pkgconfig.swift
1414
script:
15-
- swift test
15+
- swift test -Xlinker -w
1616
- os: linux
1717
language: generic
1818
sudo: required
@@ -35,7 +35,7 @@ matrix:
3535
- wget -q -O - https://swift.org/keys/all-keys.asc | gpg --import -
3636
- wget https://swift.org/builds/swift-5.0-release/ubuntu1404/swift-5.0-RELEASE/swift-5.0-RELEASE-ubuntu14.04.tar.gz
3737
- tar xzf swift-5.0-RELEASE-ubuntu14.04.tar.gz
38-
- export PATH=${PWD}/swift-4.2-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
38+
- export PATH=${PWD}/swift-5.0-RELEASE-ubuntu14.04/usr/bin:"${PATH}"
3939
- sudo ./swift-5.0-RELEASE-ubuntu14.04/usr/bin/swift utils/make-pkgconfig.swift
4040
script:
4141
- ./swift-5.0-RELEASE-ubuntu14.04/usr/bin/swift test

Package.swift

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -21,16 +21,10 @@ let package = Package(
2121
]),
2222
.target(
2323
name: "llvmshims",
24-
dependencies: ["cllvm"],
25-
swiftSettings: [
26-
.unsafeFlags([ "-Xlinker", "-w" ], .when(platforms: [.macOS]))
27-
]),
24+
dependencies: ["cllvm"]),
2825
.target(
2926
name: "LLVM",
30-
dependencies: ["cllvm", "llvmshims"],
31-
swiftSettings: [
32-
.unsafeFlags([ "-Xlinker", "-w" ], .when(platforms: [.macOS]))
33-
]),
27+
dependencies: ["cllvm", "llvmshims"]),
3428
.testTarget(
3529
name: "LLVMTests",
3630
dependencies: ["LLVM", "FileCheck"]),

0 commit comments

Comments
 (0)