From: Samuel Martin Date: Thu, 21 Aug 2014 20:45:20 +0000 (+0200) Subject: toolchainfile.cmake.in: do not force the CMAKE_{C, CXX}_FLAGS to the cache X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=47544e43a5e36f6c4ee1acb06315ab974cde78b4;p=buildroot.git toolchainfile.cmake.in: do not force the CMAKE_{C, CXX}_FLAGS to the cache Fix #7280 [1] When the FORCE option is passed to the set command, the variable is added/updated in the CMake cache every single time CMake processes this command. Because the toolchainfile.cmake prepends architecture/toolchain flags to the CMAKE_{C,CXX}_FLAGS, this makes the CFLAGS being updated in the generated Makefiles each time one reconfigures its project. So it forces the compilation of everything, even when nothing has changed. [1] https://bugs.busybox.net/show_bug.cgi?id=7280 Signed-off-by: Samuel Martin Tested-by: Thomas De Schampheleire (tested the SimpleApp reproduction scenario described in the bug report) Signed-off-by: Peter Korsgaard --- diff --git a/support/misc/toolchainfile.cmake.in b/support/misc/toolchainfile.cmake.in index 1dfbdba2d1..4ca3d35a30 100644 --- a/support/misc/toolchainfile.cmake.in +++ b/support/misc/toolchainfile.cmake.in @@ -12,8 +12,8 @@ string(REPLACE "/usr/share/buildroot" "" RELOCATED_HOST_DIR ${CMAKE_CURRENT_LIST set(CMAKE_SYSTEM_NAME Linux) -set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@ ${CMAKE_C_FLAGS}" CACHE STRING "Buildroot CFLAGS" FORCE) -set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@ ${CMAKE_CXX_FLAGS}" CACHE STRING "Buildroot CXXFLAGS" FORCE) +set(CMAKE_C_FLAGS "@@TARGET_CFLAGS@@ ${CMAKE_C_FLAGS}" CACHE STRING "Buildroot CFLAGS") +set(CMAKE_CXX_FLAGS "@@TARGET_CXXFLAGS@@ ${CMAKE_CXX_FLAGS}" CACHE STRING "Buildroot CXXFLAGS") set(CMAKE_EXE_LINKER_FLAGS "@@TARGET_LDFLAGS@@ ${CMAKE_EXE_LINKER_FLAGS}" CACHE STRING "Buildroot LDFLAGS") set(CMAKE_INSTALL_SO_NO_EXE 0)