From 6a9e72b0d3b12f46972b77bb7dc270c1571b5eae Mon Sep 17 00:00:00 2001 From: Devin Gillman Date: Sat, 28 Dec 2024 17:02:33 -0600 Subject: [PATCH] BuildSetup: Added HomeBrew Apple Silicon paths. Addresses issue here: https://discuss.haiku-os.org/t/building-on-macos-cannot-find-zstd-h/14489/4 And the differences are called out on the install page here: https://docs.brew.sh/Installation Cleanups by waddlesplash: put the new paths in their own 'block' and adjust comments. Change-Id: Ie00fbc07abae141d8ac0580dd661a2fc3cf7a216 Reviewed-on: https://review.haiku-os.org/c/haiku/+/8732 Reviewed-by: waddlesplash --- build/jam/BuildSetup | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/build/jam/BuildSetup b/build/jam/BuildSetup index e1793f01a0..9f7eab2d0e 100644 --- a/build/jam/BuildSetup +++ b/build/jam/BuildSetup @@ -501,15 +501,20 @@ if $(HOST_PLATFORM) = freebsd { if $(HOST_PLATFORM) = darwin { HOST_HDRS += [ FDirName $(HAIKU_TOP) src build libgnuregex ] ; - # Mac OS X users may be using macports libraries, in which case the headers + # macOS users may be using macports libraries, in which case the headers # and the libs are located in /opt/local/. HOST_HDRS += /opt/local/include ; HOST_LINKFLAGS += -L/opt/local/lib ; - # Mac OS X users may be using homebrew libraries, in which case the headers - # and the libs are locted in the /usr/local/. + # macOS users may be using homebrew libraries, in which case the headers + # and the libs are located in /usr/local/. HOST_HDRS += /usr/local/include ; HOST_LINKFLAGS += -L/usr/local/lib ; + + # macOS users on Apple Silicon will usually have homebrew installed + # in /opt/homebrew instead of /usr/local. + HOST_HDRS += /opt/homebrew/include ; + HOST_LINKFLAGS += -L/opt/homebrew/lib ; } HOST_BE_API_HEADERS =