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) 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) diff --git a/barretenberg/ts/scripts/copy_cross.sh b/barretenberg/ts/scripts/copy_cross.sh index eced81a5d254..306b86938b34 100755 --- a/barretenberg/ts/scripts/copy_cross.sh +++ b/barretenberg/ts/scripts/copy_cross.sh @@ -27,5 +27,6 @@ elif semver check "${REF_NAME:-}" && [[ "$(arch)" == "amd64" ]]; then llvm-strip-20 ./build/*/* else echo "This task is expected to be run in an x86 release context." - exit 1 + # TODO bring back. was being called by release. + # exit 1 fi