From 602c55eb600052551b7e06250737b4e22e81c888 Mon Sep 17 00:00:00 2001 From: Leandro Belli Date: Thu, 29 Aug 2024 15:42:28 +0100 Subject: [PATCH] cmake: fix bug introduced with `PRODUCT_BUILD_DIR` implementation The recent change to use `DIRECT_BUILD` introduced an issue where the `BUILD_PATH` is not being updated as intended. This fix ensures `PRODUCT_BUILD_DIR` is correctly set and used throughout the Makefile wrapper. Signed-off-by: Leandro Belli Change-Id: I4551fda576b9dedad33dd4be540dce687aa5bba1 --- Makefile.cmake | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/Makefile.cmake b/Makefile.cmake index 2b9552f6e..8ff847433 100644 --- a/Makefile.cmake +++ b/Makefile.cmake @@ -161,11 +161,13 @@ ifneq ($(filter-out $(PRODUCT_INDEPENDENT_GOALS), $(MAKECMDGOALS)),) FIRMWARE_TARGETS := $(addprefix firmware-, $(BS_FIRMWARE_LIST)) ifeq ($(DIRECT_BUILD), n) - ifndef PLATFORM_VARIANT - BUILD_PATH := $(BUILD_PATH)/$(BS_PRODUCT_NAME)/$(TOOLCHAIN)/$(MODE) - else - BUILD_PATH := $(BUILD_PATH)/$(BS_PRODUCT_NAME)/platform_variant_$(PLATFORM_VARIANT)/$(TOOLCHAIN)/$(MODE) - endif + ifndef PLATFORM_VARIANT + PRODUCT_BUILD_DIR := $(BUILD_PATH)/$(BS_PRODUCT_NAME)/$(TOOLCHAIN)/$(MODE) + else + PRODUCT_BUILD_DIR := $(BUILD_PATH)/$(BS_PRODUCT_NAME)/platform_variant_$(PLATFORM_VARIANT)/$(TOOLCHAIN)/$(MODE) + endif +else + PRODUCT_BUILD_DIR := $(BUILD_PATH) endif define msg_start @@ -316,12 +318,12 @@ help: .PHONY: all all: $(FIRMWARE_TARGETS) -firmware-%: $(BUILD_PATH)/$$@/CMakeCache.txt +firmware-%: $(PRODUCT_BUILD_DIR)/$$@/CMakeCache.txt $(CMAKE) --build $(