From 117b705612ef57f604c3c21a34a6f55586d6f0fc Mon Sep 17 00:00:00 2001
From: Jesse Vincent <jesse@keyboard.io>
Date: Fri, 23 Oct 2020 23:16:28 -0700
Subject: [PATCH] since we're now using arduino's tools builds, we don't need
 to set the path to /usr/local/bin on FreeBSD

---
 etc/kaleidoscope-builder.conf | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/etc/kaleidoscope-builder.conf b/etc/kaleidoscope-builder.conf
index 97046b23..650d3b11 100644
--- a/etc/kaleidoscope-builder.conf
+++ b/etc/kaleidoscope-builder.conf
@@ -14,23 +14,18 @@ fi
 
 if [ "${ARCH}" = "virtual" ]; then
 	: "${FQBN:=keyboardio:virtual:${BOARD}}"
-	: "${COMPILER_PATH:=/usr/bin/}"
+	if [ "${uname_S}" = "FreeBSD" ]; then
+		: "${COMPILER_PATH:=/usr/local/bin/}"
+	else
+		: "${COMPILER_PATH:=/usr/bin/}"
+	fi
 
 	COMPILER_PREFIX=""
 fi
 
 : "${FQBN:=keyboardio:${ARCH}:${BOARD}}"
 
-if [ "${uname_S}" = "FreeBSD" ]; then
-	: "${AVR_SIZE:=/usr/local/bin/avr-size}"
-	: "${AVR_NM:=/usr/local/bin/avr-nm}"
-	: "${AVR_OBJDUMP:=/usr/local/bin/avr-objdump}"
-
-	if [ "${ARCH}" = "virtual" ]; then
-		: "${COMPILER_PATH:=/usr/local/bin/}"
-	fi
-
-elif [ "${uname_O}" = "Cygwin" ]; then
+if [ "${uname_O}" = "Cygwin" ]; then
 	# The Windows arduino-builder.exe doesn't understand being told to exec against Cygwin symlinks
 	CCACHE_NOT_SUPPORTED=1