qmk_firmware

commit b0f5eb8f00c0fd1b8be2a88ba7c31898e8408a32
parent 367b8e09d9c7d4aa62e49eedac0d66fb72414c38
Author: QMK Bot <hello@qmk.fm>
Date:   Thu, 31 Aug 2023 23:27:22 +0000

Merge remote-tracking branch 'origin/master' into develop

Diffstat:
M
util/install/macos.sh
 | 
7
++++++-

1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/util/install/macos.sh b/util/install/macos.sh
@@ -19,8 +19,13 @@ _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-gcc-bin@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
 }