Skip to content

Commit 0e0f392

Browse files
committed
examples/sotest: fix CMake dynlib fixture dependencies
1 parent 7bdc63b commit 0e0f392

1 file changed

Lines changed: 13 additions & 3 deletions

File tree

examples/sotest/main/CMakeLists.txt

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,28 @@ if(CONFIG_EXAMPLES_SOTEST)
2727
set(SOTEST_MODPRINT_ELF ${CMAKE_BINARY_DIR}/bin/modprint)
2828
set(SOTEST_SHARED_ELF ${CMAKE_BINARY_DIR}/bin/sotest)
2929

30+
# Dynamic applications are wrapped in ELF_* helper targets when the build
31+
# uses the non-ELF-capable compiler path.
32+
if(CMAKE_C_ELF_COMPILER)
33+
set(SOTEST_MODPRINT_TARGET modprint)
34+
set(SOTEST_SHARED_TARGET sotest)
35+
else()
36+
set(SOTEST_MODPRINT_TARGET ELF_modprint)
37+
set(SOTEST_SHARED_TARGET ELF_sotest)
38+
endif()
39+
3040
add_custom_command(
3141
OUTPUT ${SOTEST_SYMTAB}
3242
COMMAND
3343
sh -c
3444
"\"${NUTTX_APPS_DIR}/tools/mksymtab.sh\" \"${SOTEST_MODPRINT_ELF}\" \"${SOTEST_SHARED_ELF}\" g_sot > \"${SOTEST_SYMTAB}\""
35-
DEPENDS modprint sotest
45+
DEPENDS ${SOTEST_MODPRINT_TARGET} ${SOTEST_SHARED_TARGET}
3646
VERBATIM)
3747

3848
set(SOTEST_SRCS sotest_main.c ${SOTEST_SYMTAB})
3949

4050
if(CONFIG_EXAMPLES_SOTEST_BUILTINFS)
41-
set(SOTEST_ROMFS_DEPS modprint sotest)
51+
set(SOTEST_ROMFS_DEPS ${SOTEST_MODPRINT_TARGET} ${SOTEST_SHARED_TARGET})
4252

4353
if(CONFIG_SYSTEM_NXPKG)
4454
set(SOTEST_SHARED_INDEX ${CMAKE_BINARY_DIR}/bin/shared-index.json)
@@ -51,7 +61,7 @@ if(CONFIG_EXAMPLES_SOTEST)
5161
${CMAKE_CURRENT_SOURCE_DIR}/mk_pkg_fixture_shared.py
5262
${SOTEST_MODPRINT_ELF} ${SOTEST_SHARED_ELF} ${SOTEST_SHARED_INDEX}
5363
${SOTEST_SHARED_SCRIPT} ${CONFIG_ARCH} ${CONFIG_ARCH_BOARD}
54-
DEPENDS modprint sotest
64+
DEPENDS ${SOTEST_MODPRINT_TARGET} ${SOTEST_SHARED_TARGET}
5565
${CMAKE_CURRENT_SOURCE_DIR}/mk_pkg_fixture_shared.py
5666
VERBATIM)
5767

0 commit comments

Comments
 (0)