From c1a62f316eca6a17e25b8fddef4857ce984e614b Mon Sep 17 00:00:00 2001 From: Marian Buschsieweke Date: Mon, 10 Oct 2022 12:26:17 +0200 Subject: [PATCH] cpu/esp32: move ESP32_SDK_DIR definition here The definition in `pkg/esp32_sdk/Makefile.include` was evaluated by `make` after the include paths were already set, resulting in `ESP32_SDK_DIR` being empty in INCLUDES += -I$(ESP32_SDK_DIR)/components [...] This in turn resulted in cc1: error: /components: No such file or directory [-Werror=missing-include-dirs] [...] --- cpu/esp32/Makefile.include | 2 ++ pkg/esp32_sdk/Makefile.include | 2 -- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/cpu/esp32/Makefile.include b/cpu/esp32/Makefile.include index d1123dfd75..12a4be6e17 100644 --- a/cpu/esp32/Makefile.include +++ b/cpu/esp32/Makefile.include @@ -1,6 +1,8 @@ # ESP32x specific flashing options FLASH_CHIP = $(CPU_FAM) +export ESP32_SDK_DIR ?= $(PKGDIRBASE)/esp32_sdk + # Serial flasher config as used by the ESP-IDF, be careful when overriding them. # They have to be exported to use same values in subsequent makefiles. ifeq (esp32,$(CPU_FAM)) diff --git a/pkg/esp32_sdk/Makefile.include b/pkg/esp32_sdk/Makefile.include index d028aa7943..783882473b 100644 --- a/pkg/esp32_sdk/Makefile.include +++ b/pkg/esp32_sdk/Makefile.include @@ -1,3 +1 @@ -export ESP32_SDK_DIR ?= $(PKGDIRBASE)/esp32_sdk - PSEUDOMODULES += esp32_sdk