package/pkg-cmake.mk: add ccache support for host packages
PATCH v2 1/1 package/pkg-cmake.mk: add ccache support for host packages
This ccache support for host-cmake-package uses the same logic as the one done for the target packages in the toolchainfile.cmake file.
---
changes v1->v2:
- rebase
- no longer an RFC
- set some make vars. to simplify the logic (ThomasP).
--- package/pkg-cmake.mk | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+)
package/pkg-cmake.mk +18 -0
@@ -20,6 +20,17 @@ # ################################################################################ +# Set compiler variables. +ifeq ($(BR2_CCACHE),y) +CMAKE_HOST_C_COMPILER="$(HOST_DIR)/usr/bin/ccache" +CMAKE_HOST_CXX_COMPILER="$(HOST_DIR)/usr/bin/ccache" +CMAKE_HOST_C_COMPILER_ARG1="$(HOSTCC)" +CMAKE_HOST_CXX_COMPILER_ARG1="$(HOSTCXX)" +else +CMAKE_HOST_C_COMPILER="$$(HOSTCC)" +CMAKE_HOST_CXX_COMPILER="$$(HOSTCXX)" +endif + ################################################################################ # inner-cmake-package -- defines how the configuration, compilation and # installation of a CMake package should be done, implements a few hooks to
@@ -95,6 +106,13 @@ define $(2)_CONFIGURE_CMDS -DCMAKE_C_FLAGS="$$(HOST_CFLAGS)" \ -DCMAKE_CXX_FLAGS="$$(HOST_CXXFLAGS)" \ -DCMAKE_EXE_LINKER_FLAGS="$$(HOST_LDFLAGS)" \ + -DCMAKE_ASM_COMPILER="$$(HOSTAS)" \ + -DCMAKE_C_COMPILER="$$(CMAKE_HOST_C_COMPILER) \ + -DCMAKE_C_COMCXX_COMPILER="$$(CMAKE_HOST_CXX_COMPILER) \ + $(if $$(CMAKE_HOST_C_COMPILER_ARG1),\ + -DCMAKE_C_COMPILER_ARG1=$$(CMAKE_HOST_C_COMPILER_ARG1) \ + -DCMAKE_CXX_COMPILER_ARG1=$$(CMAKE_HOST_CXX_COMPILER_ARG1) \ + ) \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \ -DBUILD_DOCS=OFF \
Signature · 1 line
2.1.3
PATCH v2 1/1 package/pkg-cmake.mk: add ccache support for host packages
Dear Samuel Martin,
Quoted 5 lines · Samuel Martin
This ccache support for host-cmake-package uses the same logic as the one done for the target packages in the toolchainfile.cmake file.
Signed-off-by Samuel Martin <[email protected]>Cc Thomas Petazzoni <[email protected]>
Seriously, do you test your patches before sending them?
package/pkg-cmake.mk line 27
Quoted 5 lines
package/pkg-cmake.mk +5
-0+# Set compiler variables. +ifeq ($(BR2_CCACHE),y) +CMAKE_HOST_C_COMPILER="$(HOST_DIR)/usr/bin/ccache" +CMAKE_HOST_CXX_COMPILER="$(HOST_DIR)/usr/bin/ccache" +CMAKE_HOST_C_COMPILER_ARG1="$(HOSTCC)"
This should have been HOSTCC_NOCCACHE.
Quoted 1 line
+CMAKE_HOST_CXX_COMPILER_ARG1="$(HOSTCXX)"
This should have been HOSTCXX_NOCCACHE.
Otherwise, HOSTCC and HOSTCXX already contains
"$(HOST_DIR)/usr/bin/ccache /usr/bin/gcc".
package/pkg-cmake.mk define $(2)_CONFIGURE_CMDS · line 110
Quoted 1 line
package/pkg-cmake.mk +1
-0+ -DCMAKE_C_COMPILER="$$(CMAKE_HOST_C_COMPILER) \
Missing closing double quote.
package/pkg-cmake.mk define $(2)_CONFIGURE_CMDS · line 111
Quoted 1 line
package/pkg-cmake.mk +1
-0+ -DCMAKE_C_COMCXX_COMPILER="$$(CMAKE_HOST_CXX_COMPILER) \
Really C_COMCXX_COMPILER ?
This was really a completely crappy and untested patch. How do you want us to trust your future submissions if you submit such things?
I've applied after fixing this mess.
Thanks,
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Free Electrons Embedded Linux, Kernel and Android engineering http://free-electrons.com