From 4a5925668a29224b3d28134a9308b1ab92285fa0 Mon Sep 17 00:00:00 2001
From: Kenn Sebesta <kenn@eissQ.com>
Date: Sat, 12 Mar 2022 13:21:50 -0500
Subject: [PATCH 1/3] [Make] Only check for ARM-gcc version if the SDK is
 installed

---
 make/tools.mk | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/make/tools.mk b/make/tools.mk
index 67d53e52..b1b6af3c 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -216,6 +216,9 @@ gtest_clean:
 
 ifneq ("$(wildcard $(ARM_SDK_DIR))","")
   ARM_SDK_PREFIX := $(ARM_SDK_DIR)/bin/arm-none-eabi-
+
+  # Get the ARM GCC version
+  ARM_GCC_VERSION := $(shell $(ARM_SDK_PREFIX)gcc -dumpversion)
 else
   ifneq ($(MAKECMDGOALS),arm_sdk_install)
     $(info **WARNING** ARM-SDK not in $(ARM_SDK_DIR)  Please run 'make arm_sdk_install')
@@ -224,8 +227,6 @@ else
   ARM_SDK_PREFIX ?= arm-none-eabi-
 endif
 
-# Get the ARM GCC version
-ARM_GCC_VERSION := $(shell $(ARM_SDK_PREFIX)gcc -dumpversion)
 
 # Get the git branch name, commit hash, and clean/dirty state
 GIT_BRANCH_NAME := $(shell git rev-parse --abbrev-ref HEAD)

From 816f87a0854187ef62740cfeac9cabb973c10c79 Mon Sep 17 00:00:00 2001
From: Kenn Sebesta <kenn@eissQ.com>
Date: Sat, 12 Mar 2022 13:22:42 -0500
Subject: [PATCH 2/3] [Make][Tools] Don't depend on pip stuff being on the path

---
 make/tools.mk | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/make/tools.mk b/make/tools.mk
index b1b6af3c..66db198c 100644
--- a/make/tools.mk
+++ b/make/tools.mk
@@ -89,7 +89,7 @@ qt_sdk_install: QT_SDK_FILE := $(notdir $(QT_SDK_URL))
 qt_sdk_install: | $(DL_DIR) $(TOOLS_DIR)
 qt_sdk_install: qt_sdk_clean
 # binary only release so just download and extract it
-	$(V1) aqt install-qt --keep --archive-dest "$(DL_DIR)/Qt" $(QT_SDK_HOST) desktop $(QT_SDK_VER) $(QT_SDK_ARCH) --outputdir $(QT_ROOT)
+	$(V1) $(PYTHON) -m aqt install-qt --keep --archive-dest "$(DL_DIR)/Qt" $(QT_SDK_HOST) desktop $(QT_SDK_VER) $(QT_SDK_ARCH) --outputdir $(QT_ROOT)
 
 .PHONY: qt_sdk_clean
 qt_sdk_clean:
@@ -141,7 +141,7 @@ endif
 
 qt_creator_install:
 # binary only release so just download and extract it
-	$(V1) aqt install-tool --keep --archive-dest "$(DL_DIR)/Qt" $(QT_CREATOR_HOST) desktop tools_qtcreator qt.tools.qtcreator --outputdir $(QT_CREATOR_DIR)
+	$(V1) $(PYTHON) -m aqt install-tool --keep --archive-dest "$(DL_DIR)/Qt" $(QT_CREATOR_HOST) desktop tools_qtcreator qt.tools.qtcreator --outputdir $(QT_CREATOR_DIR)
 
 .PHONY: qt_creator_configure
 qt_creator_configure:

From ed1229477f295102eff32612e452212eea4ed9b3 Mon Sep 17 00:00:00 2001
From: Kenn Sebesta <kenn@eissQ.com>
Date: Sat, 12 Mar 2022 13:23:01 -0500
Subject: [PATCH 3/3] [Makefile] Use the $(PYTHON) variable, instead of
 hardcoded `python3`

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 25f2f127..92c436c5 100644
--- a/Makefile
+++ b/Makefile
@@ -219,7 +219,7 @@ all_fw_package: all_fw all_fw_package_clean
 	$(V0) @echo " PACKAGE        $(ROOT_DIR)/package/*"
 
 # Place all firmware files into `./package` directory
-	$(V1) python3 package_firmware.py
+	$(V1) $(PYTHON) package_firmware.py
 
 # Find all the leftover object and lst files
 	$(eval BUILD_CRUFT := $(call rwildcard,$(ROOT_DIR)/build,*.lst *.o))