From 39d12949e96dee2c181e45211ceaf69affc7f65b Mon Sep 17 00:00:00 2001 From: Alejandro Cabeza Romero Date: Wed, 8 Apr 2026 17:11:13 +0200 Subject: [PATCH] Use appropriate objcopy on macos. --- .github/resources/witness-generator/Makefile | 6 +++--- .github/workflows/build-circuits.yml | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/.github/resources/witness-generator/Makefile b/.github/resources/witness-generator/Makefile index 9d1e6cf..8b8d0b0 100644 --- a/.github/resources/witness-generator/Makefile +++ b/.github/resources/witness-generator/Makefile @@ -9,11 +9,11 @@ endif CXX := g++ CXXFLAGS_COMMON := -std=c++11 -O3 -I. -Wno-address-of-packed-member UNAME_S := $(shell uname -s) -MACOS_OBJCOPY := /opt/homebrew/opt/llvm/bin/llvm-objcopy +MACOS_OBJCOPY := /opt/homebrew/bin/gobjcopy ifeq ($(UNAME_S),Darwin) - # On macOS CI we expect llvm-objcopy from Homebrew LLVM at this exact path. + # On macOS CI we expect GNU objcopy from Homebrew binutils at this exact path. ifeq ($(wildcard $(MACOS_OBJCOPY)),) - $(error Missing $(MACOS_OBJCOPY). Install LLVM with Homebrew or update OBJCOPY for this environment.) + $(error Missing $(MACOS_OBJCOPY). Install binutils with Homebrew or update OBJCOPY for this environment.) endif OBJCOPY := $(MACOS_OBJCOPY) else diff --git a/.github/workflows/build-circuits.yml b/.github/workflows/build-circuits.yml index 568e321..0d1d8bc 100644 --- a/.github/workflows/build-circuits.yml +++ b/.github/workflows/build-circuits.yml @@ -923,7 +923,7 @@ jobs: run: mkdir include - name: Install Dependencies [Witness Generator] - run: brew install nlohmann-json llvm + run: brew install nlohmann-json binutils - name: Install Dependencies [Prover] run: brew install nasm m4