michaelh/zephyr
1
0
Fork 0
Code Releases Activity

cmake: Fix dependency issue in x86 build scripts

Browse source 
Incremental builds have been broken in x86 due to a misconfigured
dependency. mmu_tables.bin is always generated, even for "nothing to
do" builds.

We fix this by removing the stray dependency on user_mmu_tables.bin
when not CONFIG_X86_KPTI.

Steps to reproduce:

Build any sample twice with qemu_x86 and observe that the second build
regenerates mmu_tables.bin.

Signed-off-by: Sebastian Bøe <sebastian.boe@nordicsemi.no>
This commit is contained in:
Sebastian Bøe 2019-02-20 16:22:32 +01:00 • committed by Anas Nashif
commit b75115a49e
1 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
arch/x86/CMakeLists.txt
View file

@ -122,14 +122,20 @@ if(CONFIG_X86_MMU)
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
) )
if(CONFIG_X86_KPTI)
set(user_mmu_tables_bin user_mmu_tables.bin)
endif()
add_custom_target( add_custom_target(
mmu_tables_bin_target mmu_tables_bin_target
DEPENDS DEPENDS
user_mmu_tables.bin
mmu_tables.bin mmu_tables.bin
${user_mmu_tables_bin}
) )
add_custom_command( add_custom_command(
OUTPUT mmu_tables.bin user_mmu_tables.bin OUTPUT
mmu_tables.bin
${user_mmu_tables_bin}
COMMAND COMMAND
${PYTHON_EXECUTABLE} ${PYTHON_EXECUTABLE}
${ZEPHYR_BASE}/scripts/gen_mmu_x86.py ${ZEPHYR_BASE}/scripts/gen_mmu_x86.py