aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Kaylan <1063516+kaylanm@users.noreply.github.com>2018-11-12 11:20:56 -0500
committerDrashna Jaelre <drashna@live.com>2018-11-12 12:16:43 -0800
commitb1e74aee43596e2601248b0a78b2c54c897ce78b (patch)
tree34d9d207b98586f0e72d8be12f759aca3c1f5124
parent2509039abfc5f59d791c8e061641b6fc2e63a69b (diff)
downloadfirmware-b1e74aee43596e2601248b0a78b2c54c897ce78b.tar.gz
firmware-b1e74aee43596e2601248b0a78b2c54c897ce78b.tar.bz2
firmware-b1e74aee43596e2601248b0a78b2c54c897ce78b.zip
Make sure that avr-gcc@7 gets linked into the path on MacOS.
-rw-r--r--docs/faq_build.md2
-rw-r--r--docs/getting_started_build_tools.md1
-rwxr-xr-xutil/macos_install.sh1
3 files changed, 3 insertions, 1 deletions
diff --git a/docs/faq_build.md b/docs/faq_build.md
index 465a283ae..14c61a1e9 100644
--- a/docs/faq_build.md
+++ b/docs/faq_build.md
@@ -126,5 +126,5 @@ For now, you need to rollback avr-gcc to 7 in brew.
```
brew uninstall --force avr-gcc
brew install avr-gcc@7
-brew link avr-gcc@7
+brew link --force avr-gcc@7
```
diff --git a/docs/getting_started_build_tools.md b/docs/getting_started_build_tools.md
index 587dece4a..67bbe5434 100644
--- a/docs/getting_started_build_tools.md
+++ b/docs/getting_started_build_tools.md
@@ -57,6 +57,7 @@ If you're using [homebrew,](http://brew.sh/) you can use the following commands:
brew tap PX4/homebrew-px4
brew update
brew install avr-gcc@7
+ brew link --force avr-gcc@7
brew install dfu-programmer
brew install dfu-util
brew install gcc-arm-none-eabi
diff --git a/util/macos_install.sh b/util/macos_install.sh
index c31be99d2..d2629a8cb 100755
--- a/util/macos_install.sh
+++ b/util/macos_install.sh
@@ -23,3 +23,4 @@ brew tap osx-cross/avr
brew tap PX4/homebrew-px4
brew update
brew install avr-gcc@7 gcc-arm-none-eabi dfu-programmer avrdude dfu-util
+brew link --force avr-gcc@7