michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Remove dead code from EDK generation

Browse source 
This code was supposed to be gone on the patch that handled imacros, but
it was forgotten.

Signed-off-by: Ederson de Souza <ederson.desouza@intel.com>
This commit is contained in:
Ederson de Souza 2024-05-24 14:55:36 -07:00 • committed by Anas Nashif
commit 3caaa19c4b
2 changed files with 0 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

1
CMakeLists.txt
View file

@ -2141,7 +2141,6 @@ add_custom_command(
-DAPPLICATION_SOURCE_DIR=${APPLICATION_SOURCE_DIR} -DAPPLICATION_SOURCE_DIR=${APPLICATION_SOURCE_DIR}
-DINTERFACE_INCLUDE_DIRECTORIES="$<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES>" -DINTERFACE_INCLUDE_DIRECTORIES="$<TARGET_PROPERTY:zephyr_interface,INTERFACE_INCLUDE_DIRECTORIES>"
-Dllext_edk_file=${llext_edk_file} -Dllext_edk_file=${llext_edk_file}
-DAUTOCONF_H=${AUTOCONF_H}
-Dllext_cflags="${llext_edk_cflags}" -Dllext_cflags="${llext_edk_cflags}"
-Dllext_edk_name=${CONFIG_LLEXT_EDK_NAME} -Dllext_edk_name=${CONFIG_LLEXT_EDK_NAME}
-DWEST_TOPDIR=${WEST_TOPDIR} -DWEST_TOPDIR=${WEST_TOPDIR}

4
cmake/llext-edk.cmake
View file

@ -17,7 +17,6 @@
# - INTERFACE_INCLUDE_DIRECTORIES: List of include directories to copy headers # - INTERFACE_INCLUDE_DIRECTORIES: List of include directories to copy headers
# from. It should simply be the INTERFACE_INCLUDE_DIRECTORIES property of the # from. It should simply be the INTERFACE_INCLUDE_DIRECTORIES property of the
# zephyr_interface target. # zephyr_interface target.
# - AUTOCONF_H: Name of the autoconf.h file, used to generate the imacros flag.
# - llext_edk_file: Output file name for the tarball. # - llext_edk_file: Output file name for the tarball.
# - llext_cflags: Additional flags to be added to the generated flags. # - llext_cflags: Additional flags to be added to the generated flags.
# - ZEPHYR_BASE: Path to the zephyr base directory. # - ZEPHYR_BASE: Path to the zephyr base directory.
@ -120,9 +119,6 @@ endforeach()
set(llext_cflags ${new_cflags}) set(llext_cflags ${new_cflags})
set(autoconf_h_edk ${llext_edk_inc}/${AUTOCONF_H})
cmake_path(RELATIVE_PATH AUTOCONF_H BASE_DIRECTORY ${PROJECT_BINARY_DIR} OUTPUT_VARIABLE autoconf_h_rel)
list(APPEND base_flags_make ${llext_cflags} ${imacros_make}) list(APPEND base_flags_make ${llext_cflags} ${imacros_make})
list(APPEND base_flags_cmake ${llext_cflags} ${imacros_cmake}) list(APPEND base_flags_cmake ${llext_cflags} ${imacros_cmake})