Update Brioche pack tools

brioche-dev · May 30, 2024 · 04547c4 · 04547c4
1 parent 4ea867a
commit 04547c4
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git 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<std.Directory> {
   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/fcd15e70e1ad94b354515a534dd025c3f462677a/x86_64-linux/brioche-pack.tar.zstd",
       hash: std.sha256Hash(
-        "42225bcbb94b44687daa3a7b52f10cc82ce888b74df30b6a146f71edf427f729",
+        "c3e1c14ff928a03c3a0f33149d17b933024f27ac04aff508b38199d4ecea5e9b",
       ),
     })
     .unarchive("tar", "zstd");

diff --git 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<std.Recipe> => {
     })
     .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
@@ -19,8 +19,8 @@ export default std.memo((): std.Recipe<std.Directory> => {
     ),
   });
 
-  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
@@ -10,8 +10,8 @@ export function useBriocheLd(
   dir: std.Recipe<std.Directory>,
   options: UseBriocheLdOptions,
 ): std.Recipe<std.Directory> {
-  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);