Skip to content

Commit 12b3f18

Browse files
authored
🔨 mac_gcc: Use configured brew/port paths (#27655)
1 parent 4d0c684 commit 12b3f18

File tree

2 files changed

+11
-8
lines changed

2 files changed

+11
-8
lines changed

buildroot/bin/mac_gcc

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,19 @@
1010
which port >/dev/null && HAS_MACPORTS=1
1111
which brew >/dev/null && HAS_HOMEBREW=1
1212

13+
MACPORTS_PATH=$(dirname "$(which port)")
14+
HOMEBREW_PATH="$(brew --prefix)/bin"
15+
1316
if [[ $1 == "apple" || $1 == "darwin" || $1 == "system" ]]; then
1417

1518
if ((HAS_MACPORTS)); then
16-
cd /opt/local/bin
19+
cd $MACPORTS_PATH
1720
sudo rm -f gcc g++ cc ld
1821
cd -
1922
fi
2023

2124
if ((HAS_HOMEBREW)); then
22-
cd /opt/homebrew/bin
25+
cd $HOMEBREW_PATH
2326
sudo rm -f gcc g++ cc
2427
cd -
2528
fi
@@ -28,15 +31,15 @@ elif [[ $1 =~ ".*ports" ]]; then
2831

2932
((HAS_MACPORTS)) || { echo "MacPorts is not installed"; exit 1; }
3033

31-
GCCV=$( find /opt/local/bin -name "gcc-mp-*" | sort -r | head -1 | sed 's/.*gcc-mp-//' )
34+
GCCV=$( find $MACPORTS_PATH -name "gcc-mp-*" | sort -r | head -1 | sed 's/.*gcc-mp-//' )
3235
[[ $GCCV -ge 11 ]] || GCCV=14
3336

3437
getport() { port installed $1 | grep $1 || sudo port install $1; }
3538
getports() { for p in $@; do getport $p; done; }
3639

3740
getports "gcc$GCCV" glm mesa libsdl2 libsdl2_net
3841

39-
cd /opt/local/bin
42+
cd $MACPORTS_PATH
4043
sudo rm -f gcc g++ cc ld
4144
sudo ln -s "gcc-mp-$GCCV" gcc
4245
sudo ln -s "g++-mp-$GCCV" g++
@@ -48,12 +51,12 @@ elif [[ $1 =~ ".*brew" ]]; then
4851

4952
((HAS_HOMEBREW)) || { echo "Homebrew is not installed"; exit 1; }
5053

51-
GCCV=$( find /opt/homebrew/bin -name "gcc-*" | sort -r | head -1 | sed 's/.*gcc-//' )
54+
GCCV=$( find $HOMEBREW_PATH -name "gcc-*" | sort -r | head -1 | sed 's/.*gcc-//' )
5255
[[ $GCCV -ge 11 ]] || { brew install gcc@14 ; GCCV=14 }
5356

5457
brew install glm mesa sdl2 sdl2_net
5558

56-
cd /opt/homebrew/bin
59+
cd $HOMEBREW_PATH
5760
sudo rm -f gcc g++ cc
5861
sudo ln -s "gcc-$GCCV" gcc
5962
sudo ln -s "g++-$GCCV" g++

ini/native.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
8989
#
9090
# sudo port install gcc14 glm mesa libsdl2 libsdl2_net
9191
#
92-
# cd /opt/local/bin
92+
# cd $(dirname "$(which port)")
9393
# sudo rm gcc g++ cc ld
9494
# sudo ln -s gcc-mp-14 gcc ; sudo ln -s g++-mp-14 g++ ; sudo ln -s g++ cc
9595
# sudo ln -s ld-classic ld
@@ -103,7 +103,7 @@ build_flags = ${simulator_linux.build_flags} ${simulator_linux.release_flags}
103103
#
104104
# brew install gcc@14 glm mesa sdl2 sdl2_net
105105
#
106-
# cd /opt/homebrew/bin
106+
# cd "$(brew --prefix)/bin"
107107
# sudo rm -f gcc g++ cc
108108
# sudo ln -s gcc-14 gcc ; sudo ln -s g++-14 g++ ; sudo ln -s g++ cc
109109
# cd -

0 commit comments

Comments
 (0)