diff options
| author | 2023-04-02 21:47:15 +0300 | |
|---|---|---|
| committer | 2023-04-02 21:50:01 +0300 | |
| commit | a6dbcffe2ce03f9571da693852181a785942ec4b (patch) | |
| tree | ab5eb4b7591c104fd04758c32039dda03b67f3ea /build.zig | |
| parent | Release 0.2.1 (diff) | |
| download | zup-a6dbcffe2ce03f9571da693852181a785942ec4b.tar.gz zup-a6dbcffe2ce03f9571da693852181a785942ec4b.tar.xz zup-a6dbcffe2ce03f9571da693852181a785942ec4b.zip | |
Actually use my zig-curl instead of zelda.
I'll wait until zelda & zig get more stable and get more contributors.
Also, zelda has been archived on April 1st, perhaps a joke, perhaps not.
This reverts commit 081e79c3fa385c662a5a6b7faf717ec370b398c8.
This reverts commit 33226c20c41e3fe2de3330b6692c90bc4818b119.
This reverts commit 3b3baf375be63acfd293b1b47a5f49aab4b06a70.
Diffstat (limited to 'build.zig')
| -rw-r--r-- | build.zig | 12 |
1 files changed, 4 insertions, 8 deletions
| @@ -1,11 +1,10 @@ | |||
| 1 | const builtin = @import("builtin"); | 1 | const builtin = @import("builtin"); |
| 2 | const std = @import("std"); | 2 | const std = @import("std"); |
| 3 | const zelda = @import("libs/zelda/build.zig"); | ||
| 4 | 3 | ||
| 5 | const Builder = std.build.Builder; | 4 | const Builder = std.build.Builder; |
| 6 | const SemanticVersion = std.SemanticVersion; | 5 | const SemanticVersion = std.SemanticVersion; |
| 7 | 6 | ||
| 8 | pub fn build(b: *Builder) !void { | 7 | pub fn build(b: *Builder) void { |
| 9 | const target = b.standardTargetOptions(.{}); | 8 | const target = b.standardTargetOptions(.{}); |
| 10 | const mode = b.standardReleaseOptions(); | 9 | const mode = b.standardReleaseOptions(); |
| 11 | 10 | ||
| @@ -16,17 +15,14 @@ pub fn build(b: *Builder) !void { | |||
| 16 | exe.setTarget(target); | 15 | exe.setTarget(target); |
| 17 | exe.setBuildMode(mode); | 16 | exe.setBuildMode(mode); |
| 18 | exe.addOptions("zup-config", config); | 17 | exe.addOptions("zup-config", config); |
| 19 | // TODO[https://github.com/ziglang/zig/issues/13551]: Remove this | ||
| 20 | exe.linkSystemLibraryPkgConfigOnly("libcrypto"); | ||
| 21 | try zelda.link(b, exe, target, mode, true); | ||
| 22 | exe.addPackagePath("clap", "libs/clap/clap.zig"); | 18 | exe.addPackagePath("clap", "libs/clap/clap.zig"); |
| 19 | exe.addPackagePath("curl", "libs/curl/curl.zig"); | ||
| 23 | exe.addPackagePath("libarchive", "libs/libarchive/libarchive.zig"); | 20 | exe.addPackagePath("libarchive", "libs/libarchive/libarchive.zig"); |
| 24 | exe.addPackagePath("xdg", "libs/xdg/xdg.zig"); | 21 | exe.addPackagePath("xdg", "libs/xdg/xdg.zig"); |
| 25 | exe.addPackagePath("zup", "src/main.zig"); | 22 | exe.addPackagePath("zup", "src/main.zig"); |
| 26 | exe.linkLibC(); | 23 | exe.linkLibC(); |
| 27 | // TODO[https://github.com/ziglang/zig/issues/13551]: | 24 | exe.linkSystemLibrary("libarchive"); |
| 28 | // Replace this with linkSystemLibrary("archive") | 25 | exe.linkSystemLibrary("libcurl"); |
| 29 | exe.linkSystemLibraryPkgConfigOnly("libarchive"); | ||
| 30 | exe.install(); | 26 | exe.install(); |
| 31 | 27 | ||
| 32 | const run_cmd = exe.run(); | 28 | const run_cmd = exe.run(); |