From 74488a57a062a0cc28e0aea03dec45974b0f7c1c Mon Sep 17 00:00:00 2001 From: Christian Pointner Date: Wed, 5 Oct 2022 23:42:41 +0200 Subject: make toolchain path config a little bit less invasive --- chibios-blink/Makefile | 1 + defines.mk | 2 +- sdk-blink/Makefile | 5 ++++- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/chibios-blink/Makefile b/chibios-blink/Makefile index 4c08d58..9180851 100644 --- a/chibios-blink/Makefile +++ b/chibios-blink/Makefile @@ -4,6 +4,7 @@ # include ../defines.mk +export PATH := $(TOOLCHAIN_PATH):$(PATH) # Compiler options here. diff --git a/defines.mk b/defines.mk index 4aefee7..9af1f53 100644 --- a/defines.mk +++ b/defines.mk @@ -24,7 +24,7 @@ ifndef SPREADRPPICO_PATH SPREADRPPICO_PATH := .. endif -export PATH := $(SPREADRPPICO_PATH)/contrib/gcc-arm-none-eabi-10.3-2021.10/bin:$(PATH) +TOOLCHAIN_PATH := $(SPREADRPPICO_PATH)/contrib/gcc-arm-none-eabi-10.3-2021.10/bin CHIBIOS := ../contrib/ChibiOS_21.11.2 CHIBIOS_CONTRIB := $(CHIBIOS)/community OPENOCD := $(SPREADRPPICO_PATH)/contrib/openocd diff --git a/sdk-blink/Makefile b/sdk-blink/Makefile index 4a6a8f4..ca7776e 100644 --- a/sdk-blink/Makefile +++ b/sdk-blink/Makefile @@ -24,7 +24,7 @@ PROJECT := blink include ../defines.mk all: build -.PHONY: build clean +.PHONY: build clean distclean build/Makefile: mkdir -p build @@ -34,6 +34,9 @@ build: build/Makefile make -C build clean: + make -C build clean + +distclean: rm -rf build include ../rules.mk -- cgit v1.2.3