summaryrefslogtreecommitdiff
path: root/util
diff options
context:
space:
mode:
Diffstat (limited to 'util')
-rwxr-xr-xutil/install/macos.sh15
1 files changed, 8 insertions, 7 deletions
diff --git a/util/install/macos.sh b/util/install/macos.sh
index a1b79fe868..4db2f9be6b 100755
--- a/util/install/macos.sh
+++ b/util/install/macos.sh
@@ -9,23 +9,24 @@ _qmk_install_prepare() {
9 return 1 9 return 1
10 fi 10 fi
11 11
12 # Conflicts with arm-none-eabi toolchain from osx-cross
13 brew uninstall --ignore-dependencies --cask gcc-arm-embedded >/dev/null 2>&1
14 brew uninstall --ignore-dependencies homebrew/core/arm-none-eabi-gcc >/dev/null 2>&1
15 brew uninstall --ignore-dependencies homebrew/core/arm-none-eabi-binutils >/dev/null 2>&1
16 brew uninstall --ignore-dependencies osx-cross/arm/arm-gcc-bin@8 >/dev/null 2>&1
17
12 brew update && brew upgrade --formulae 18 brew update && brew upgrade --formulae
13} 19}
14 20
15_qmk_install() { 21_qmk_install() {
16 echo "Installing dependencies" 22 echo "Installing dependencies"
17 23
18 # All macOS dependencies are managed in the Homebrew package: 24 # All macOS & Python dependencies are managed in the Homebrew package:
19 # https://github.com/qmk/homebrew-qmk 25 # https://github.com/qmk/homebrew-qmk
20 brew install qmk/qmk/qmk 26 brew install qmk/qmk/qmk
21 27
22 # Conflicts with new toolchain formulae
23 brew uninstall --ignore-dependencies arm-gcc-bin@8 >/dev/null 2>&1
24
25 # Keg-only, so need to be manually linked 28 # Keg-only, so need to be manually linked
26 brew link --force avr-gcc@8 29 brew link --force avr-gcc@8
27 brew link --force arm-none-eabi-binutils 30 brew link --force arm-none-eabi-binutils
28 brew link --force arm-none-eabi-gcc@8 31 brew link --force arm-none-eabi-gcc@8
29
30 python3 -m pip install -r $QMK_FIRMWARE_DIR/requirements.txt
31} 32}