Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

macOS install: remove bad ARM toolchains #24637

Draft
wants to merge 1 commit into
base: develop
Choose a base branch
from
+6 −3
Draft

macOS install: remove bad ARM toolchains #24637

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions util/install/macos.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
}

Expand All @@ -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
Expand Down