From adb20fb2f38781811704687ab6b10f0f26cdf66c Mon Sep 17 00:00:00 2001 From: wangmengyang Date: Tue, 25 May 2021 11:51:28 +0800 Subject: [PATCH] components/bt: fix PATH of libbtdm_app.a in build script --- components/bt/CMakeLists.txt | 2 +- components/bt/component.mk | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/bt/CMakeLists.txt b/components/bt/CMakeLists.txt index 3fe4dcfe06..f14045ada8 100644 --- a/components/bt/CMakeLists.txt +++ b/components/bt/CMakeLists.txt @@ -573,6 +573,6 @@ idf_component_register(SRCS "${srcs}" if(CONFIG_BT_ENABLED) target_compile_options(${COMPONENT_LIB} PRIVATE -Wno-implicit-fallthrough -Wno-unused-const-variable) - target_link_libraries(${COMPONENT_LIB} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib") + target_link_libraries(${COMPONENT_LIB} INTERFACE "-L${CMAKE_CURRENT_LIST_DIR}/controller/lib/esp32") target_link_libraries(${COMPONENT_LIB} PUBLIC btdm_app) endif() diff --git a/components/bt/component.mk b/components/bt/component.mk index 187fc6dfe2..890015ea9c 100644 --- a/components/bt/component.mk +++ b/components/bt/component.mk @@ -9,11 +9,11 @@ COMPONENT_ADD_INCLUDEDIRS := include LIBS := btdm_app -COMPONENT_ADD_LDFLAGS := -lbt -L $(COMPONENT_PATH)/controller/lib \ +COMPONENT_ADD_LDFLAGS := -lbt -L $(COMPONENT_PATH)/controller/lib/esp32 \ $(addprefix -l,$(LIBS)) # re-link program if BT binary libs change -COMPONENT_ADD_LINKER_DEPS := $(patsubst %,$(COMPONENT_PATH)/controller/lib/lib%.a,$(LIBS)) +COMPONENT_ADD_LINKER_DEPS := $(patsubst %,$(COMPONENT_PATH)/controller/lib/esp32/lib%.a,$(LIBS)) COMPONENT_SUBMODULES += controller/lib