diff options
author | Danny Nguyen <danny@keeb.io> | 2019-06-05 13:53:11 -0400 |
---|---|---|
committer | Drashna Jaelre <drashna@live.com> | 2019-06-05 17:51:39 -0700 |
commit | 4f2f2271cda85c3939deb3f61bbd9430e38a20fc (patch) | |
tree | 15214714724a4280d4195089a0d543d869e3b65f | |
parent | de968eb310b82dbba7c69971ad0d1280aaac7b27 (diff) | |
download | qmk_firmware-4f2f2271cda85c3939deb3f61bbd9430e38a20fc.tar.gz qmk_firmware-4f2f2271cda85c3939deb3f61bbd9430e38a20fc.zip |
Change from avr-gcc@7 to @8 for Mac
-rw-r--r-- | docs/faq_build.md | 4 | ||||
-rw-r--r-- | docs/getting_started_build_tools.md | 6 | ||||
-rw-r--r-- | docs/zh-cn/faq_build.md | 4 | ||||
-rwxr-xr-x | util/macos_install.sh | 4 |
4 files changed, 9 insertions, 9 deletions
diff --git a/docs/faq_build.md b/docs/faq_build.md index 0c1bedd71..23d6a6702 100644 --- a/docs/faq_build.md +++ b/docs/faq_build.md | |||
@@ -140,8 +140,8 @@ For now, you need to rollback avr-gcc to 7 in brew. | |||
140 | 140 | ||
141 | ``` | 141 | ``` |
142 | brew uninstall --force avr-gcc | 142 | brew uninstall --force avr-gcc |
143 | brew install avr-gcc@7 | 143 | brew install avr-gcc@8 |
144 | brew link --force avr-gcc@7 | 144 | brew link --force avr-gcc@8 |
145 | ``` | 145 | ``` |
146 | 146 | ||
147 | ### I just flashed my keyboard and it does nothing/keypresses don't register - it's also ARM (rev6 planck, clueboard 60, hs60v2, etc...) (Feb 2019) | 147 | ### I just flashed my keyboard and it does nothing/keypresses don't register - it's also ARM (rev6 planck, clueboard 60, hs60v2, etc...) (Feb 2019) |
diff --git a/docs/getting_started_build_tools.md b/docs/getting_started_build_tools.md index 0e1acca66..268cc94c3 100644 --- a/docs/getting_started_build_tools.md +++ b/docs/getting_started_build_tools.md | |||
@@ -62,14 +62,14 @@ If you're using [homebrew,](http://brew.sh/) you can use the following commands: | |||
62 | brew tap osx-cross/avr | 62 | brew tap osx-cross/avr |
63 | brew tap PX4/homebrew-px4 | 63 | brew tap PX4/homebrew-px4 |
64 | brew update | 64 | brew update |
65 | brew install avr-gcc@7 | 65 | brew install avr-gcc@8 |
66 | brew link --force avr-gcc@7 | 66 | brew link --force avr-gcc@8 |
67 | brew install dfu-programmer | 67 | brew install dfu-programmer |
68 | brew install dfu-util | 68 | brew install dfu-util |
69 | brew install gcc-arm-none-eabi | 69 | brew install gcc-arm-none-eabi |
70 | brew install avrdude | 70 | brew install avrdude |
71 | 71 | ||
72 | This is the recommended method. If you don't have homebrew, [install it!](http://brew.sh/) It's very much worth it for anyone who works in the command line. Note that the `make` and `make install` portion during the homebrew installation of `avr-gcc@7` can take over 20 minutes and exhibit high CPU usage. | 72 | This is the recommended method. If you don't have homebrew, [install it!](http://brew.sh/) It's very much worth it for anyone who works in the command line. Note that the `make` and `make install` portion during the homebrew installation of `avr-gcc@8` can take over 20 minutes and exhibit high CPU usage. |
73 | 73 | ||
74 | ## Windows with msys2 (recommended) | 74 | ## Windows with msys2 (recommended) |
75 | 75 | ||
diff --git a/docs/zh-cn/faq_build.md b/docs/zh-cn/faq_build.md index 60d902007..8fb449db3 100644 --- a/docs/zh-cn/faq_build.md +++ b/docs/zh-cn/faq_build.md | |||
@@ -137,8 +137,8 @@ brew install avrdude | |||
137 | 137 | ||
138 | ``` | 138 | ``` |
139 | brew uninstall --force avr-gcc | 139 | brew uninstall --force avr-gcc |
140 | brew install avr-gcc@7 | 140 | brew install avr-gcc@8 |
141 | brew link --force avr-gcc@7 | 141 | brew link --force avr-gcc@8 |
142 | ``` | 142 | ``` |
143 | 143 | ||
144 | ### 我刷新了我的键盘但是键盘不工作/按键没有注册 - 而且还是ARM的 (rev6 planck, clueboard 60, hs60v2, etc...) (Feb 2019) | 144 | ### 我刷新了我的键盘但是键盘不工作/按键没有注册 - 而且还是ARM的 (rev6 planck, clueboard 60, hs60v2, etc...) (Feb 2019) |
diff --git a/util/macos_install.sh b/util/macos_install.sh index 93f3ed0b9..915ff3143 100755 --- a/util/macos_install.sh +++ b/util/macos_install.sh | |||
@@ -22,5 +22,5 @@ fi | |||
22 | brew tap osx-cross/avr | 22 | brew tap osx-cross/avr |
23 | brew tap PX4/homebrew-px4 | 23 | brew tap PX4/homebrew-px4 |
24 | brew update | 24 | brew update |
25 | brew install avr-gcc@7 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3 | 25 | brew install avr-gcc@8 gcc-arm-none-eabi dfu-programmer avrdude dfu-util python3 |
26 | brew link --force avr-gcc@7 | 26 | brew link --force avr-gcc@8 |