@@ -2220,46 +2220,48 @@ if((CMAKE_BUILD_TYPE IN_LIST build_types) AND (NOT NO_BUILD_TYPE_WARNING))
2220
2220
endif ()
2221
2221
2222
2222
# Extension Development Kit (EDK) generation.
2223
- set (llext_edk_file ${PROJECT_BINARY_DIR} /${CONFIG_LLEXT_EDK_NAME}.tar.xz )
2223
+ if (CONFIG_LLEXT_EDK )
2224
+ set (llext_edk_file ${PROJECT_BINARY_DIR} /${CONFIG_LLEXT_EDK_NAME}.tar.xz )
2224
2225
2225
- # TODO maybe generate flags for C CXX ASM
2226
- zephyr_get_compile_definitions_for_lang (C zephyr_defs )
2227
- zephyr_get_compile_options_for_lang (C zephyr_flags )
2226
+ # TODO maybe generate flags for C CXX ASM
2227
+ zephyr_get_compile_definitions_for_lang (C zephyr_defs )
2228
+ zephyr_get_compile_options_for_lang (C zephyr_flags )
2228
2229
2229
- # Filter out non LLEXT and LLEXT_EDK flags - and add required ones
2230
- llext_filter_zephyr_flags (LLEXT_REMOVE_FLAGS ${zephyr_flags} llext_filt_flags )
2231
- llext_filter_zephyr_flags (LLEXT_EDK_REMOVE_FLAGS ${llext_filt_flags} llext_filt_flags )
2230
+ # Filter out non LLEXT and LLEXT_EDK flags - and add required ones
2231
+ llext_filter_zephyr_flags (LLEXT_REMOVE_FLAGS ${zephyr_flags} llext_filt_flags )
2232
+ llext_filter_zephyr_flags (LLEXT_EDK_REMOVE_FLAGS ${llext_filt_flags} llext_filt_flags )
2232
2233
2233
- set (llext_edk_cflags ${zephyr_defs} -DLL_EXTENSION_BUILD )
2234
- list (APPEND llext_edk_cflags ${llext_filt_flags} )
2235
- list (APPEND llext_edk_cflags ${LLEXT_APPEND_FLAGS} )
2236
- list (APPEND llext_edk_cflags ${LLEXT_EDK_APPEND_FLAGS} )
2234
+ set (llext_edk_cflags ${zephyr_defs} -DLL_EXTENSION_BUILD )
2235
+ list (APPEND llext_edk_cflags ${llext_filt_flags} )
2236
+ list (APPEND llext_edk_cflags ${LLEXT_APPEND_FLAGS} )
2237
+ list (APPEND llext_edk_cflags ${LLEXT_EDK_APPEND_FLAGS} )
2237
2238
2238
- build_info (llext-edk file PATH ${llext_edk_file} )
2239
- build_info (llext-edk cflags VALUE ${llext_edk_cflags} )
2240
- build_info (llext-edk include -dirs VALUE "$<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES>" )
2239
+ build_info (llext-edk file PATH ${llext_edk_file} )
2240
+ build_info (llext-edk cflags VALUE ${llext_edk_cflags} )
2241
+ build_info (llext-edk include -dirs VALUE "$<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES>" )
2241
2242
2242
- add_custom_command (
2243
+ add_custom_command (
2243
2244
OUTPUT ${llext_edk_file}
2244
2245
# Regenerate syscalls in case CONFIG_LLEXT_EDK_USERSPACE_ONLY
2245
2246
COMMAND ${CMAKE_COMMAND}
2246
- -E make_directory edk/include/generated/zephyr
2247
+ -E make_directory edk/include/generated/zephyr
2247
2248
COMMAND
2248
- ${PYTHON_EXECUTABLE}
2249
- ${ZEPHYR_BASE} /scripts/build/gen_syscalls.py
2250
- --json-file ${syscalls_json} # Read this file
2251
- --base-output edk/include/generated/zephyr/syscalls # Write to this dir
2252
- --syscall-dispatch edk/include/generated/zephyr/syscall_dispatch.c # Write this file
2253
- --syscall-list ${edk_syscall_list_h}
2254
- $< $< BOOL:${CONFIG_LLEXT_EDK_USERSPACE_ONLY} > :--userspace-only>
2255
- ${SYSCALL_LONG_REGISTERS_ARG}
2256
- ${SYSCALL_SPLIT_TIMEOUT_ARG}
2249
+ ${PYTHON_EXECUTABLE}
2250
+ ${ZEPHYR_BASE} /scripts/build/gen_syscalls.py
2251
+ --json-file ${syscalls_json} # Read this file
2252
+ --base-output edk/include/generated/zephyr/syscalls # Write to this dir
2253
+ --syscall-dispatch edk/include/generated/zephyr/syscall_dispatch.c # Write this file
2254
+ --syscall-list ${edk_syscall_list_h}
2255
+ $< $< BOOL:${CONFIG_LLEXT_EDK_USERSPACE_ONLY} > :--userspace-only>
2256
+ ${SYSCALL_LONG_REGISTERS_ARG}
2257
+ ${SYSCALL_SPLIT_TIMEOUT_ARG}
2257
2258
COMMAND ${CMAKE_COMMAND}
2258
2259
-P ${ZEPHYR_BASE} /cmake/llext-edk.cmake
2259
2260
DEPENDS ${logical_target_for_zephyr_elf} build_info_yaml_saved
2260
2261
COMMAND_EXPAND_LISTS
2261
- )
2262
- add_custom_target (llext-edk DEPENDS ${llext_edk_file} )
2262
+ )
2263
+ add_custom_target (llext-edk DEPENDS ${llext_edk_file} )
2264
+ endif ()
2263
2265
2264
2266
# @Intent: Set compiler specific flags for standard C/C++ includes
2265
2267
# Done at the very end, so any other system includes which may
0 commit comments