🔨 mac_gcc: Use configured brew/port paths (#27655)

MarlinFirmware · Feb 15, 2025 · 12b3f18 · 12b3f18
1 parent 4d0c684
commit 12b3f18
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/buildroot/bin/mac_gcc b/buildroot/bin/mac_gcc
@@ -10,16 +10,19 @@
 which port >/dev/null && HAS_MACPORTS=1
 which brew >/dev/null && HAS_HOMEBREW=1
 
+MACPORTS_PATH=$(dirname "$(which port)")
+HOMEBREW_PATH="$(brew --prefix)/bin"
+
 if [[ $1 == "apple" || $1 == "darwin" || $1 == "system" ]]; then
 
   if ((HAS_MACPORTS)); then
-    cd /opt/local/bin
+    cd $MACPORTS_PATH
     sudo rm -f gcc g++ cc ld
     cd -
   fi
 
   if ((HAS_HOMEBREW)); then
-    cd /opt/homebrew/bin
+    cd $HOMEBREW_PATH
     sudo rm -f gcc g++ cc
     cd -
   fi
@@ -28,15 +31,15 @@ elif [[ $1 =~ ".*ports" ]]; then
 
   ((HAS_MACPORTS)) || { echo "MacPorts is not installed"; exit 1; }
 
-  GCCV=$( find /opt/local/bin -name "gcc-mp-*" | sort -r | head -1 | sed 's/.*gcc-mp-//' )
+  GCCV=$( find $MACPORTS_PATH -name "gcc-mp-*" | sort -r | head -1 | sed 's/.*gcc-mp-//' )
   [[ $GCCV -ge 11 ]] || GCCV=14
 
   getport() { port installed $1 | grep $1 || sudo port install $1; }
   getports() { for p in $@; do getport $p; done; }
 
   getports "gcc$GCCV" glm mesa libsdl2 libsdl2_net
 
-  cd /opt/local/bin
+  cd $MACPORTS_PATH
   sudo rm -f gcc g++ cc ld
   sudo ln -s "gcc-mp-$GCCV" gcc
   sudo ln -s "g++-mp-$GCCV" g++
@@ -48,12 +51,12 @@ elif [[ $1 =~ ".*brew" ]]; then
 
   ((HAS_HOMEBREW)) || { echo "Homebrew is not installed"; exit 1; }
 
-  GCCV=$( find /opt/homebrew/bin -name "gcc-*" | sort -r | head -1 | sed 's/.*gcc-//' )
+  GCCV=$( find $HOMEBREW_PATH -name "gcc-*" | sort -r | head -1 | sed 's/.*gcc-//' )
   [[ $GCCV -ge 11 ]] || { brew install gcc@14 ; GCCV=14 }
 
   brew install glm mesa sdl2 sdl2_net
 
-  cd /opt/homebrew/bin
+  cd $HOMEBREW_PATH
   sudo rm -f gcc g++ cc
   sudo ln -s "gcc-$GCCV" gcc
   sudo ln -s "g++-$GCCV" g++

diff --git a/ini/native.ini b/ini/native.ini
@@ -89,7 +89,7 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
 #
 #  sudo port install gcc14 glm mesa libsdl2 libsdl2_net
 #
-#  cd /opt/local/bin
+#  cd $(dirname "$(which port)")
 #  sudo rm gcc g++ cc ld
 #  sudo ln -s gcc-mp-14 gcc ; sudo ln -s g++-mp-14 g++ ; sudo ln -s g++ cc
 #  sudo ln -s ld-classic ld
@@ -103,7 +103,7 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
 #
 #  brew install gcc@14 glm mesa sdl2 sdl2_net
 #
-#  cd /opt/homebrew/bin
+#  cd "$(brew --prefix)/bin"
 #  sudo rm -f gcc g++ cc
 #  sudo ln -s gcc-14 gcc ; sudo ln -s g++-14 g++ ; sudo ln -s g++ cc
 #  cd -