diff options
author | Ryan <[email protected]> | 2025-01-06 13:19:45 +1100 |
---|---|---|
committer | GitHub <[email protected]> | 2025-01-06 13:19:45 +1100 |
commit | a336c04a6a1f21a5b4a84b848f4037841f2bf5d6 (patch) | |
tree | c3d7b15f3052c9f0906ab2cda818a9d2fb39089b | |
parent | 9339e3c35d971c9415acff8a63b2c5e6eaa7b555 (diff) | |
download | qmk_firmware-a336c04a6a1f21a5b4a84b848f4037841f2bf5d6.tar.gz qmk_firmware-a336c04a6a1f21a5b4a84b848f4037841f2bf5d6.zip |
macOS install: remove bad ARM toolchains (#24637)
-rwxr-xr-x | util/install/macos.sh | 15 |
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() { 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 } _qmk_install() { echo "Installing dependencies" - # All macOS dependencies are managed in the Homebrew package: - # https://github.com/qmk/homebrew-qmk + # All macOS & Python dependencies are managed in the Homebrew package: + # 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 brew link --force arm-none-eabi-gcc@8 - - python3 -m pip install -r $QMK_FIRMWARE_DIR/requirements.txt } |