diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk index dc545caed9..3ee7067250 100644 --- a/package/pkg-cmake.mk +++ b/package/pkg-cmake.mk @@ -22,10 +22,10 @@ # Set compiler variables. ifeq ($(BR2_CCACHE),y) -CMAKE_HOST_C_COMPILER = $(HOST_DIR)/bin/ccache -CMAKE_HOST_CXX_COMPILER = $(HOST_DIR)/bin/ccache -CMAKE_HOST_C_COMPILER_ARG1 = $(HOSTCC_NOCCACHE) -CMAKE_HOST_CXX_COMPILER_ARG1 = $(HOSTCXX_NOCCACHE) +CMAKE_HOST_C_COMPILER = $(HOSTCC_NOCCACHE) +CMAKE_HOST_CXX_COMPILER = $(HOSTCXX_NOCCACHE) +CMAKE_HOST_C_COMPILER_LAUNCHER = $(HOST_DIR)/bin/ccache +CMAKE_HOST_CXX_COMPILER_LAUNCHER = $(HOST_DIR)/bin/ccache else CMAKE_HOST_C_COMPILER = $(HOSTCC) CMAKE_HOST_CXX_COMPILER = $(HOSTCXX) @@ -134,9 +134,9 @@ define $(2)_CONFIGURE_CMDS -DCMAKE_ASM_COMPILER="$$(HOSTAS)" \ -DCMAKE_C_COMPILER="$$(CMAKE_HOST_C_COMPILER)" \ -DCMAKE_CXX_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)" \ + $(if $$(CMAKE_HOST_C_COMPILER_LAUNCHER),\ + -DCMAKE_C_COMPILER_LAUNCHER="$$(CMAKE_HOST_C_COMPILER_LAUNCHER)" \ + -DCMAKE_CXX_COMPILER_LAUNCHER="$$(CMAKE_HOST_CXX_COMPILER_LAUNCHER)" \ ) \ -DCMAKE_COLOR_MAKEFILE=OFF \ -DBUILD_DOC=OFF \