Skip to content

Commit

Permalink
fix up some more stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Rexicon226 committed Jun 30, 2024
1 parent 9fbdc75 commit 27e6ca9
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 8 deletions.
3 changes: 1 addition & 2 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,7 @@ pub fn build(b: *std.Build) !void {
exe.root_module.addImport("cpython", cpython_dep.module("cpython"));
exe.root_module.addImport("vaxis", libvaxis.module("vaxis"));

// install the Lib folder from python
const python_dep = b.dependency("python", .{});
const python_dep = cpython_dep.builder.dependency("python", .{});
const libpython_install = b.addInstallDirectory(.{
.source_dir = python_dep.path("Lib"),
.install_dir = .{ .custom = "python" },
Expand Down
5 changes: 0 additions & 5 deletions build.zig.zon
Original file line number Diff line number Diff line change
Expand Up @@ -13,11 +13,6 @@
.url = "https://github.com/Rexicon226/zig-tracer/archive/6400e066bb3849be4906f3b6e124d6c8c5a5083f.tar.gz",
.hash = "122057453dba0b0cf6f07610d692cc7ab3f1d66defa150c936b398144812564a0c08",
},
// needs to be kept in sync with cpython dep
.python = .{
.url = "https://github.com/Rexicon226/cpython/archive/cdb93314157b15ba6ba0832f4ad7c84c11088331.tar.gz",
.hash = "12201233efd4fb9453166782f1beb083953b3e9cc2b347621a55482addf0714e6962",
},
.libgc = .{
.url = "https://github.com/Rexicon226/zig-libgc/archive/1ea12e140ec1471af5d15dae71b225764c9747ba.tar.gz",
.hash = "12209ad7282d9422973afe3e468e2f867bb102d04fa446a1d1c94f900bda94b7c68e",
Expand Down
2 changes: 1 addition & 1 deletion src/frontend/Python.zig
Original file line number Diff line number Diff line change
Expand Up @@ -87,7 +87,7 @@ pub fn Initialize(
_ = externs.PyConfig_Read(&config);

const utf32_path = try utf8ToUtf32Z(
"/home/dr/Zython/osmium/zig-out/python/Lib",
build_options.lib_path,
allocator,
);

Expand Down

0 comments on commit 27e6ca9

Please sign in to comment.