Skip to content

cmake: normalize .config on reconfigure #19693

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
xiaoxiang781216 merged 1 commit into from
Aug 12, 2026
+18 −5
Merged

cmake: normalize .config on reconfigure #19693

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 13 additions & 3 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -368,6 +368,9 @@ if(NOT EXISTS ${NUTTX_BINARY_DIR}/.config OR NOT "${NUTTX_DEFCONFIG}" STREQUAL
# Do olddefconfig step to expand the abbreviated defconfig into normal config
nuttx_olddefconfig()

# save the orig compressed formatted defconfig at the very beginning
nuttx_save_defconfig_orig()

file(RENAME ${NUTTX_BINARY_DIR}/.config.compressed
${NUTTX_BINARY_DIR}/.config)
set(ENV{KCONFIG_CONFIG} ${NUTTX_BINARY_DIR}/.config)
Expand All @@ -385,9 +388,11 @@ if(NOT EXISTS ${NUTTX_BINARY_DIR}/.config OR NOT "${NUTTX_DEFCONFIG}" STREQUAL
endif()
file(WRITE ${NUTTX_BINARY_DIR}/.config "${_config_init_content}")

# store original expanded .config
configure_file(${NUTTX_BINARY_DIR}/.config ${NUTTX_BINARY_DIR}/.config.orig
COPYONLY)
# store original expanded .config; plain copy so .config does not become a
# configure dependency: the compiler cannot change after the first configure,
# so a modified .config must not reconfigure mid-build
execute_process(COMMAND ${CMAKE_COMMAND} -E copy ${NUTTX_BINARY_DIR}/.config
${NUTTX_BINARY_DIR}/.config.orig)

set(NUTTX_DEFCONFIG_SAVED
${NUTTX_DEFCONFIG}
Expand All @@ -411,6 +416,11 @@ if(NOT EXISTS ${NUTTX_BINARY_DIR}/.config OR NOT "${NUTTX_DEFCONFIG}" STREQUAL
message(STATUS " Board: ${NUTTX_BOARD}")
message(STATUS " Config: ${NUTTX_CONFIG}")
message(STATUS " Appdir: ${NUTTX_APPS_DIR}")
else()
# Normalize user modifications to .config (e.g. kconfig-tweak) so dependent
# defaults materialize, as the Make flow does on each build
set(ENV{KCONFIG_CONFIG} ${NUTTX_BINARY_DIR}/.config)
nuttx_olddefconfig()
endif()

# declare global custom targets at very beginning `nuttx_global` is used to hold
Expand Down
7 changes: 5 additions & 2 deletions cmake/nuttx_kconfig.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,8 +216,12 @@ function(nuttx_olddefconfig)
"nuttx_olddefconfig: Failed to initialize Kconfig configuration: ${KCONFIG_OUTPUT}"
)
endif()
endfunction()

# save the orig compressed formatted defconfig at the very beginning; only valid
# during the initial configure while .config.compressed exists

# save the orig compressed formatted defconfig at the very beginning
function(nuttx_save_defconfig_orig)
execute_process(COMMAND savedefconfig --out ${NUTTX_BINARY_DIR}/defconfig.tmp
WORKING_DIRECTORY ${NUTTX_DIR})

Expand All @@ -227,7 +231,6 @@ function(nuttx_olddefconfig)
${NUTTX_BINARY_DIR}/.config.compressed ${NUTTX_BINARY_DIR}/defconfig.tmp
${NUTTX_BINARY_DIR}/defconfig.orig
WORKING_DIRECTORY ${NUTTX_DIR})

endfunction()

function(nuttx_setconfig)
Expand Down
Loading