From f428918183e2d141927217dce77e739baec6b8d6 Mon Sep 17 00:00:00 2001
From: Wolfgang Thaller <wolfgang.thaller@gmx.net>
Date: Sat, 6 Feb 2021 15:30:43 +0100
Subject: [PATCH] add default search paths for dependencies installed via
 homebrew on ARM macs

---
 Rez/CMakeLists.txt   |  2 +-
 build-toolchain.bash | 42 +++++++++++++++++-------------------------
 2 files changed, 18 insertions(+), 26 deletions(-)

diff --git a/Rez/CMakeLists.txt b/Rez/CMakeLists.txt
index 75bf239d5f..e34ce8944c 100644
--- a/Rez/CMakeLists.txt
+++ b/Rez/CMakeLists.txt
@@ -21,7 +21,7 @@ find_package(Boost COMPONENTS wave filesystem system thread regex program_option
     # We need Version 3, and Mac OS X still comes with an outdated version (2.3).
     # So we just add the path where the homebrew package manager installs its
     # "keg-only" version. Shouldn't hurt on Linux.
-set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} "/usr/local/opt/bison/bin")
+set(CMAKE_PROGRAM_PATH ${CMAKE_PROGRAM_PATH} "/opt/homebrew/opt/bison/bin" "/usr/local/opt/bison/bin")
 find_package(BISON 3.0.2)
 
 if(NOT Boost_FOUND)
diff --git a/build-toolchain.bash b/build-toolchain.bash
index cf72a491d1..6e37c72ef4 100755
--- a/build-toolchain.bash
+++ b/build-toolchain.bash
@@ -209,21 +209,26 @@ if [ $SKIP_THIRDPARTY != true ]; then
 	fi
 	mkdir -p $PREFIX
 
-	# Components needed for targeting 68K: binutils, gcc
-	if [ $BUILD_68K != false ]; then
-
+	if [ `uname` = Darwin ]; then
 			# present-day Mac users are likely to install dependencies
-			# in /usr/local via the homebrew package manager
-		export CPPFLAGS="-I/usr/local/include"
-		export LDFLAGS="-L/usr/local/lib"
-
+			# via the homebrew package manager
+		if [ `uname -m` = arm64 ]; then
+			export CPPFLAGS="-I/opt/homebrew/include"
+			export LDFLAGS="-L/opt/homebrew/lib"
+		else
+			export CPPFLAGS="-I/usr/local/include"
+			export LDFLAGS="-L/usr/local/lib"
+		fi
 			# or they could be using MacPorts. Default install
 			# location is /opt/local
 		if [ -d "/opt/local/include" ]; then
 			export CPPFLAGS="$CPPFLAGS -I/opt/local/include"
 			export LDFLAGS="$LDFLAGS -L/opt/local/lib"
 		fi
-
+	fi
+		
+	# Components needed for targeting 68K: binutils, gcc
+	if [ $BUILD_68K != false ]; then
 		export CC=$HOST_C_COMPILER
 		export CXX=$HOST_CXX_COMPILER
 
@@ -248,8 +253,6 @@ if [ $SKIP_THIRDPARTY != true ]; then
 		unset target_configargs
 		cd ..
 
-		unset CPPFLAGS
-		unset LDFLAGS
 		unset CC
 		unset CXX
 
@@ -269,19 +272,6 @@ if [ $SKIP_THIRDPARTY != true ]; then
 
 	# Components needed for targeting PPC (including Carbon): binutils, gcc
 	if [ $BUILD_PPC != false ]; then
-
-			# present-day Mac users are likely to install dependencies
-			# in /usr/local via the homebrew package manager
-		export CPPFLAGS="-I/usr/local/include"
-		export LDFLAGS="-L/usr/local/lib"
-
-			# or they could be using MacPorts. Default install
-			# location is /opt/local
-		if [ -d "/opt/local/include" ]; then
-			export CPPFLAGS="$CPPFLAGS -I/opt/local/include"
-			export LDFLAGS="$LDFLAGS -L/opt/local/lib"
-		fi
-
 		export CC=$HOST_C_COMPILER
 		export CXX=$HOST_CXX_COMPILER
 
@@ -304,8 +294,6 @@ if [ $SKIP_THIRDPARTY != true ]; then
 		unset target_configargs
 		cd ..
 
-		unset CPPFLAGS
-		unset LDFLAGS
 		unset CC
 		unset CXX
 
@@ -315,6 +303,10 @@ if [ $SKIP_THIRDPARTY != true ]; then
 		fi
 	fi
 
+	unset CPPFLAGS
+	unset LDFLAGS
+
+
 	# Build hfsutil
 	mkdir -p $PREFIX/lib
 	mkdir -p $PREFIX/share/man/man1