aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Bernd Amend <bernd.amend@gmail.com>2020-12-12 23:52:24 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2020-12-22 09:22:26 +0100
commit866db91ae207adb26c63821ed98c7ea69fd2930d (patch)
tree602a2b2dd5da62c0335c8041411e13cfa287ba75
parent31f0dd7a9ea2f98cd1cbb8b9aa13bf3df9a8cc6f (diff)
downloadbuildroot-866db91ae207adb26c63821ed98c7ea69fd2930d.tar.gz
buildroot-866db91ae207adb26c63821ed98c7ea69fd2930d.tar.bz2
pkg-cmake.mk: fix host ccache support for CMake 3.19
Starting with CMake 3.4 CMake supports setting a compiler launcher like ccache. The feature is described in https://cmake.org/cmake/help/latest/variable/CMAKE_LANG_COMPILER_LAUNCHER.html This should be safe since everything is built for the host using make or ninja. The use of *_ARG1 is discouraged by the cmake developers https://cmake-developers.cmake.narkive.com/OTa9EKfj/cmake-c-compiler-arg-not-documented . Without this patch I get the following error message with CMake 3.19.1 on Arch Linux. Disabling BR2_CCACHE also resolves the issue. /usr/bin/cmake [~]/buildroot/build/host-lzo-2.10/ -DCMAKE_INSTALL_SO_NO_EXE=0 -DCMAKE_FIND_ROOT_PATH="[...]" -DCMAKE_FIND_ROOT_PATH_MODE_PROGRAM="BOTH" -DCMAKE_FIND_ROOT_P ATH_MODE_LIBRARY="BOTH" -DCMAKE_FIND_ROOT_PATH_MODE_INCLUDE="BOTH" -DCMAKE_INSTALL_PREFIX="[...]" -DCMAKE_C_FLAGS="-O2 -I[...]/include" -DCMAKE_CXX_FLAGS="-O2 -I[...]/include" -DCMAKE_EXE_LINKER_FLAGS="-L[...]/lib -Wl,-rpath,[...]/lib" -DCMAKE_SHARED_LINKER_FLAGS="-L[...]/l ib -Wl,-rpath,[...]/lib" -DCMAKE_ASM_COMPILER="/usr/bin/as" -DCMAKE_C_COMPILER="[...]/bin/ccache" -DCMAKE_CXX_COMPILER="[...]/bin/ccache" -DCMAKE_C_COMPILER_ARG1="/usr/bin/gcc" -DCMAKE_CXX_COMPILER_ARG1="/usr/bin/g++" -DCMAKE_COLOR_MAKEFILE=OFF -DBUILD_DOC=OFF -DBUILD_DOCS=OFF -DBUILD_EXAMPLE=OFF -DBUILD_EXAMPLES=OFF -DBUILD_TEST=OFF -DBUILD_TESTS=OFF -DBUILD_TESTING=O FF -DENABLE_SHARED=ON -DENABLE_STATIC=OFF ) -- The C compiler identification is unknown -- Detecting C compiler ABI info -- Detecting C compiler ABI info - failed -- Check for working C compiler: [...]/bin/ccache -- Check for working C compiler: [...]/bin/ccache - broken CMake Error at /usr/share/cmake-3.19/Modules/CMakeTestCCompiler.cmake:66 (message): The C compiler Signed-off-by: Bernd Amend <bernd.amend@gmail.com> Reviewed-by: Yegor Yefremov <yegorslists@googlemail.com> Tested-by: Christian Stewart <christian@paral.in> Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> (cherry picked from commit 0e310b4fd0ca14547356645b184a21f52b0c881b) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/pkg-cmake.mk14
1 files changed, 7 insertions, 7 deletions
diff --git a/package/pkg-cmake.mk b/package/pkg-cmake.mk
index 57bfea9be5..0f3d88679c 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 \