You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@nuttx.apache.org by xi...@apache.org on 2023/12/16 15:12:15 UTC

(nuttx) branch master updated: cmake: restore old behavior for savedefconfig

This is an automated email from the ASF dual-hosted git repository.

xiaoxiang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/nuttx.git


The following commit(s) were added to refs/heads/master by this push:
     new 751bc1528a cmake: restore old behavior for savedefconfig
751bc1528a is described below

commit 751bc1528a8e9f3bfbe1701619b4894f1d6dcb86
Author: raiden00pl <ra...@railab.me>
AuthorDate: Sat Dec 16 10:01:47 2023 +0100

    cmake: restore old behavior for savedefconfig
    
    savedefconfig shouldn't overwrite the original defconfig, but only create a new
    defconfig in the current directory. Otherwise, creating new configs based on
    existing ones becomes irritating, because every time we use savedefconfig,
    the original configuration is overwritten which is not the excepted behavior
---
 cmake/menuconfig.cmake | 2 --
 1 file changed, 2 deletions(-)

diff --git a/cmake/menuconfig.cmake b/cmake/menuconfig.cmake
index e8c9905f71..4e0c3ad6b6 100644
--- a/cmake/menuconfig.cmake
+++ b/cmake/menuconfig.cmake
@@ -98,8 +98,6 @@ add_custom_target(
   COMMAND echo "\\#" >> ${CMAKE_BINARY_DIR}/warning.tmp
   COMMAND cat ${CMAKE_BINARY_DIR}/warning.tmp
           ${CMAKE_BINARY_DIR}/sortedconfig.tmp > ${CMAKE_BINARY_DIR}/defconfig
-  COMMAND ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_BINARY_DIR}/defconfig
-          ${NUTTX_DEFCONFIG}
   COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/warning.tmp
   COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/defconfig.tmp
   COMMAND ${CMAKE_COMMAND} -E remove -f ${CMAKE_BINARY_DIR}/sortedconfig.tmp