Avoid duplicate library problems

Only look in root output directory for component library. Be explicit with other library paths (e.g. mbedtls)
SmingHub · Sep 2, 2021 · b7f25c9 · b7f25c9
1 parent 95296a8
commit b7f25c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/Sming/Arch/Esp32/Components/esp32/component.mk b/Sming/Arch/Esp32/Components/esp32/component.mk
@@ -25,6 +25,7 @@ SDK_LIBDIRS := \
 
 LIBDIRS += \
 	$(SDK_COMPONENT_LIBDIR) \
+	$(SDK_BUILD_BASE)/esp-idf/mbedtls/mbedtls/library \
 	$(SDK_BUILD_BASE)/esp-idf/$(ESP_VARIANT) \
 	$(SDK_BUILD_BASE)/esp-idf/$(ESP_VARIANT)/ld \
 	$(COMPONENT_PATH)/ld \

diff --git a/Sming/Arch/Esp32/Components/esp32/sdk/misc.mk b/Sming/Arch/Esp32/Components/esp32/sdk/misc.mk
@@ -7,7 +7,7 @@ include $(SMING_HOME)/build.mk
 all:
 
 # List of all generated SDK libraries
-SDK_ARCHIVE_DIRS = $(foreach c,$(SDK_COMPONENTS),$(SDK_BUILD_BASE)/esp-idf/$c $(call ListAllSubDirs,$(SDK_BUILD_BASE)/esp-idf/$c))
+SDK_ARCHIVE_DIRS = $(foreach c,$(SDK_COMPONENTS),$(SDK_BUILD_BASE)/esp-idf/$c)
 SDK_ARCHIVE_LIST = $(sort $(foreach d,$(SDK_ARCHIVE_DIRS),$(wildcard $d/*.a)))
 
 #