Skip to content

Commit 7e9faff

Browse files
committed
wheels: fixes for Swift 5.6
1 parent 2f86cf1 commit 7e9faff

File tree

4 files changed

+61
-69
lines changed

4 files changed

+61
-69
lines changed

Package.resolved

Lines changed: 56 additions & 58 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Package.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,11 +12,11 @@ let package = Package(
1212
// Dependencies declare other packages that this package depends on.
1313
.package(
1414
url: "https://github.com/apple/swift-collections.git", .upToNextMajor(from: "1.0.0")),
15-
.package(url: "https://github.com/pvieito/PythonKit", from: "0.5.0"),
15+
.package(url: "https://github.com/pvieito/PythonKit", .exact("0.4.2")),
1616
.package(url: "https://github.com/donn/Defile.git", from: "5.2.1"),
1717
.package(url: "https://github.com/attaswift/BigInt.git", from: "5.2.1"),
1818
.package(url: "https://github.com/jpsim/Yams.git", from: "5.0.6"),
19-
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.3.0"),
19+
.package(url: "https://github.com/apple/swift-argument-parser", from: "1.2.0"),
2020
],
2121
targets: [
2222
// Targets are the basic building blocks of a package. A target can define a module or a test suite.

Sources/Fault/Entries/main.swift

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -41,13 +41,6 @@ _ = [ // Register all TVGens
4141
PodemQuest.registered,
4242
]
4343

44-
let yosysTest = "'\(yosysExecutable)' -V".sh(silent: true)
45-
if yosysTest != EX_OK {
46-
Stderr.print(
47-
"Yosys must be installed to PATH on your computer for Fault to work. Fault will now quit.")
48-
exit(EX_UNAVAILABLE)
49-
}
50-
5144
let pythonVersions = {
5245
// Test Yosys, Python
5346
() -> (python: String, pyverilog: String) in

setup.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,8 @@ def custom_build(self, bext: build_ext):
5252
"release",
5353
*(["--static-swift-stdlib"] * (platform.system() != "Darwin")),
5454
"--target",
55-
"fault"
55+
"fault",
56+
"--show-bin-path"
5657
]
5758
+ shlex.split(os.getenv("spmFlags", ""))
5859
+ self.args
@@ -64,7 +65,7 @@ def custom_build(self, bext: build_ext):
6465
os.unlink(target)
6566
except FileNotFoundError:
6667
pass
67-
print(os.listdir(".build"))
68+
print(os.listdir(".build/release"))
6869
shutil.copy(os.path.join(".build", "release", "fault"), target)
6970

7071
class custom_build_ext(build_ext):

0 commit comments

Comments
 (0)