From a025212b557e10c447538708bc413d453cd536de Mon Sep 17 00:00:00 2001 From: Roman Melnikov Date: Fri, 15 Aug 2025 19:11:31 +0200 Subject: [PATCH] Use 'rustup' brew dependency for Octez brew formula. 'rustup-init.sh' script doesn't work correctly when trying to build Octez formula for x86_64 on aarch64 using Rosetta and install aarch64 version of the compiler despite the fact that build is x86_64. Unlike 'rustup install' which detects the architecture correctly. --- scripts/packaging/octez/homebrew/Formula/octez.rb.template | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/scripts/packaging/octez/homebrew/Formula/octez.rb.template b/scripts/packaging/octez/homebrew/Formula/octez.rb.template index 218493c9b5d5..9c9773e78198 100644 --- a/scripts/packaging/octez/homebrew/Formula/octez.rb.template +++ b/scripts/packaging/octez/homebrew/Formula/octez.rb.template @@ -15,7 +15,7 @@ class Octez < Formula version "%%VERSION%%" license "MIT" - build_dependencies = %w[pkg-config coreutils autoconf rsync wget opam protobuf cmake] + build_dependencies = %w[pkg-config coreutils autoconf rsync wget opam protobuf cmake rustup] build_dependencies.each do |dependency| depends_on dependency => :build end @@ -40,12 +40,9 @@ class Octez < Formula set +x . ./scripts/version.sh - wget https://sh.rustup.rs/rustup-init.sh - chmod +x rustup-init.sh - ./rustup-init.sh --profile minimal --default-toolchain $recommended_rust_version -y + rustup install $recommended_rust_version opam init --bare --disable-sandboxing - . $CARGO_HOME/env make build-deps eval $(opam env) -- GitLab