From e5d78e30ffd65a917769309b29c29172c2b9b4a1 Mon Sep 17 00:00:00 2001 From: AztecBot <49558828+AztecBot@users.noreply.github.com> Date: Thu, 26 Feb 2026 21:20:51 +0000 Subject: [PATCH 1/2] fix: add missing avm-transpiler-cross-arm64-linux Makefile target ## Summary - The `bb-cpp-cross-arm64-linux` Makefile target depended on `avm-transpiler-native` instead of a cross-compiled arm64-linux avm-transpiler - This caused `ninja` to fail because `libavm_transpiler.a` was missing at the `aarch64-unknown-linux-gnu` target path - Adds the missing `avm-transpiler-cross-arm64-linux` target and fixes the dependency so the correct cross-compiled library is built before the barretenberg ARM64 Linux link step Follows up on https://github.com/AztecProtocol/aztec-packages/pull/20814 which added avm-transpiler arm64-linux support to `bootstrap.sh` and `CMakePresets.json`, but the Makefile (introduced later) was never wired up. [ClaudeBox log](http://ci.aztec-labs.com/368dc57b68117599-1) --- Makefile | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 0ffa20c46365..4a33c3687041 100644 --- a/Makefile +++ b/Makefile @@ -83,7 +83,10 @@ avm-transpiler-cross-amd64-macos: avm-transpiler-cross-arm64-macos: $(call build,$@,avm-transpiler,build_cross arm64-macos) -avm-transpiler-cross: avm-transpiler-cross-amd64-macos avm-transpiler-cross-arm64-macos +avm-transpiler-cross-arm64-linux: + $(call build,$@,avm-transpiler,build_cross arm64-linux) + +avm-transpiler-cross: avm-transpiler-cross-amd64-macos avm-transpiler-cross-arm64-macos avm-transpiler-cross-arm64-linux #============================================================================== # Barretenberg @@ -134,7 +137,7 @@ bb-cpp-cross-arm64-macos-objects: $(call build,$@,barretenberg/cpp,build_cross_objects arm64-macos) # Cross-compile for ARM64 Linux (release only) -bb-cpp-cross-arm64-linux: bb-cpp-cross-arm64-linux-objects avm-transpiler-native +bb-cpp-cross-arm64-linux: bb-cpp-cross-arm64-linux-objects avm-transpiler-cross-arm64-linux $(call build,$@,barretenberg/cpp,build_cross arm64-linux) # Cross-compile for AMD64 macOS (release only) From dbf9cec8fa23ee912d6ec8619b693957425e9c06 Mon Sep 17 00:00:00 2001 From: AztecBot Date: Fri, 27 Feb 2026 00:39:09 +0000 Subject: [PATCH 2/2] fix: generate missing rust bindings in release instead of erroring The barretenberg-rs release function would fail if generated files (api.rs, generated_types.rs) weren't present, even though it knows how to generate them. Now it generates them on-the-fly instead of erroring out. --- barretenberg/rust/bootstrap.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/barretenberg/rust/bootstrap.sh b/barretenberg/rust/bootstrap.sh index ee974e339466..4f65698ebeac 100755 --- a/barretenberg/rust/bootstrap.sh +++ b/barretenberg/rust/bootstrap.sh @@ -54,10 +54,10 @@ function release { # Set the workspace version to match the release tag sed -i "s/^version = \".*\"/version = \"$version\"/" Cargo.toml - # Generated files must exist (created during build step) + # Generated files must exist (created during build step, or generate now) if [ ! -f barretenberg-rs/src/api.rs ] || [ ! -f barretenberg-rs/src/generated_types.rs ]; then - echo "ERROR: generated files not found. Run 'cd ../ts && yarn generate' first." - exit 1 + echo "Generated files not found, running yarn generate..." + (cd ../ts && yarn generate) fi # Publish to crates.io (--allow-dirty because version was just set and generated files are gitignored)