diff --git a/projects/std/pack_tools.bri b/projects/std/pack_tools.bri index 63ce658..9f5bbd8 100644 --- a/projects/std/pack_tools.bri +++ b/projects/std/pack_tools.bri @@ -3,9 +3,9 @@ import * as std from "/core"; export function packTools(): std.Recipe { return std .download({ - url: "https://development-content.brioche.dev/github.com/brioche-dev/brioche/commits/7995587bc9f8356780bcfb4d783eb545439ef949/x86_64-linux/brioche-pack.tar.zstd", + url: "https://development-content.brioche.dev/github.com/brioche-dev/brioche/commits/56d3348c7c818b60e3f06712d40b0086cd23e694/x86_64-linux/brioche-pack.tar.zstd", hash: std.sha256Hash( - "42225bcbb94b44687daa3a7b52f10cc82ce888b74df30b6a146f71edf427f729", + "2779ec96ab48be22cb8640d08fdbce4d65fd3c0293ecc9d5ea0b2aea918c447f", ), }) .unarchive("tar", "zstd"); diff --git a/projects/std/toolchain/stage0/index.bri b/projects/std/toolchain/stage0/index.bri index 559d31a..cf07f6f 100644 --- a/projects/std/toolchain/stage0/index.bri +++ b/projects/std/toolchain/stage0/index.bri @@ -27,8 +27,8 @@ export function bootstrapRun( }) .unarchive("tar", "xz"); - const briocheLd = packTools().get("brioche-ld"); - const briochePacked = packTools().get("brioche-packed-userland-exec"); + const briocheLd = packTools().get("bin/brioche-ld"); + const briochePacked = packTools().get("bin/brioche-packed-exec"); const bootstrapScript = std .file(options.script) @@ -124,8 +124,8 @@ export default async (): Promise => { }) .unarchive("tar", "xz"); - const briocheLd = packTools().get("brioche-ld"); - const briochePacked = packTools().get("brioche-packed-userland-exec"); + const briocheLd = packTools().get("bin/brioche-ld"); + const briochePacked = packTools().get("bin/brioche-packed-exec"); const briochePack = std.directory({ "x86_64-linux-musl": std.directory({ diff --git a/projects/std/toolchain/stage1/1_04_glibc.bri b/projects/std/toolchain/stage1/1_04_glibc.bri index 9c98a17..86a256b 100644 --- a/projects/std/toolchain/stage1/1_04_glibc.bri +++ b/projects/std/toolchain/stage1/1_04_glibc.bri @@ -19,8 +19,8 @@ export default std.memo((): std.Recipe => { ), }); - const briochePacked = packTools().get("brioche-packed-userland-exec"); - const briochePacker = packTools().get("brioche-packer"); + const briochePacked = packTools().get("bin/brioche-packed-exec"); + const briochePacker = packTools().get("bin/brioche-packer"); const stage1 = std.merge(binutils(), gcc(), linuxHeaders()); diff --git a/projects/std/toolchain/utils.bri b/projects/std/toolchain/utils.bri index c63fa34..dae645a 100644 --- a/projects/std/toolchain/utils.bri +++ b/projects/std/toolchain/utils.bri @@ -10,8 +10,8 @@ export function useBriocheLd( dir: std.Recipe, options: UseBriocheLdOptions, ): std.Recipe { - const briocheLd = packTools().get("brioche-ld"); - const briochePacked = packTools().get("brioche-packed-userland-exec"); + const briocheLd = packTools().get("bin/brioche-ld"); + const briochePacked = packTools().get("bin/brioche-packed-exec"); for (const ldPath of options.ldPaths) { const systemLd = dir.get(ldPath);