Fix build on modern versions of macOS+Homebrew ;P.

OrchidTechnologies · Jul 4, 2024 · 1f0d428 · 1f0d428
1 parent 4bc73af
commit 1f0d428
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git a/env/setup-mac.sh b/env/setup-mac.sh
@@ -2,6 +2,7 @@
 set -e
 which brew &>/dev/null || /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
 
+# XXX: duplicate linux setup as much as possible (at least ninja)
 brew install \
     fakeroot \
     rpm2cpio zstd \
@@ -10,7 +11,7 @@ brew install \
     python-packaging \
     groff \
     autoconf autoconf-archive automake \
-    libtool meson \
+    libtool meson pkg-config \
     capnp rustup-init \
 
 rustup-init -y --no-modify-path --no-update-default-toolchain

diff --git a/env/uname-Darwin.mk b/env/uname-Darwin.mk
@@ -15,7 +15,7 @@ endif
 
 prebuilt := darwin-x86_64
 
-export PATH := /usr/local/opt/gettext/bin:$(PATH)
-
+# XXX: consider detecting where homebrew is installed
 export PATH := $(PATH):/usr/local/opt/binutils/bin
+export PATH := $(PATH):/opt/homebrew/opt/binutils/bin
 objcopy = objcopy