From d789ac65fb8865e6b398731efe4177f3371ca439 Mon Sep 17 00:00:00 2001 From: fauxpark Date: Sun, 24 Nov 2024 13:26:48 +1100 Subject: [PATCH] macOS install: remove bad ARM toolchains --- util/install/macos.sh | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/util/install/macos.sh b/util/install/macos.sh index a1b79fe86839..5ab03dbf0896 100755 --- a/util/install/macos.sh +++ b/util/install/macos.sh @@ -9,6 +9,12 @@ _qmk_install_prepare() { return 1 fi + # Conflicts with arm-none-eabi toolchain from osx-cross + brew uninstall --ignore-dependencies --cask gcc-arm-embedded >/dev/null 2>&1 + brew uninstall --ignore-dependencies homebrew/core/arm-none-eabi-gcc >/dev/null 2>&1 + brew uninstall --ignore-dependencies homebrew/core/arm-none-eabi-binutils >/dev/null 2>&1 + brew uninstall --ignore-dependencies osx-cross/arm/arm-gcc-bin@8 >/dev/null 2>&1 + brew update && brew upgrade --formulae } @@ -19,9 +25,6 @@ _qmk_install() { # https://github.com/qmk/homebrew-qmk brew install qmk/qmk/qmk - # Conflicts with new toolchain formulae - brew uninstall --ignore-dependencies arm-gcc-bin@8 >/dev/null 2>&1 - # Keg-only, so need to be manually linked brew link --force avr-gcc@8 brew link --force arm-none-eabi-binutils