From 0d56a02cbde7b52fcee6186b76a61256ed1fb25f Mon Sep 17 00:00:00 2001 From: Daniele Lacamera Date: Mon, 16 Mar 2026 10:29:59 +0100 Subject: [PATCH] Fix Cmake build: added src/store_sbrk.c and fixed target dependencies --- CMakeLists.txt | 5 +++++ lib/CMakeLists.txt | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 2e10af46..35771220 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -557,6 +557,11 @@ set(WOLFBOOT_SOURCES "include/loader.h" "src/image.c" "src/loader.c") +if((DEFINED WOLFCRYPT_TZ_PKCS11 AND NOT WOLFCRYPT_TZ_PKCS11 STREQUAL "0") OR + (DEFINED WOLFCRYPT_TZ_PSA AND NOT WOLFCRYPT_TZ_PSA STREQUAL "0")) + list(APPEND WOLFBOOT_SOURCES "src/store_sbrk.c") +endif() + if(DEFINED WOLFCRYPT_TZ_PSA AND NOT WOLFCRYPT_TZ_PSA STREQUAL "0") list(APPEND WOLFBOOT_SOURCES "src/dice/dice.c") endif() diff --git a/lib/CMakeLists.txt b/lib/CMakeLists.txt index 2ce75c8e..af6c7af9 100644 --- a/lib/CMakeLists.txt +++ b/lib/CMakeLists.txt @@ -219,7 +219,7 @@ target_link_libraries(wolfcrypt target user_settings) target_compile_definitions( wolfcrypt PUBLIC WOLFSSL_USER_SETTINGS - PRIVATE ${WOLFCRYPT_DEFS} ${SIGN_OPTIONS}) + PRIVATE ${WOLFCRYPT_DEFS} ${SIGN_OPTIONS} ${WOLFBOOT_DEFS}) if(WOLFBOOT_SMALL_STACK) target_compile_definitions(wolfcrypt PRIVATE WOLFBOOT_SMALL_STACK XMALLOC_USER)