From 548b8c541285cedc390c4c95bd9d80dbad7d2a73 Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Tue, 2 Feb 2021 21:32:23 +0100 Subject: [PATCH] package/pkg-meson.mk: fix ccache auto-detection avoidance Commit f4a61d1ae23e (package/pkg-meson.mk avoid host ccache detection) forced the host C and C++ compilers so that meson does not try to autodetect ccache, and instead relies on what we provide. However, this incorrectly used single-expansion of variables in a package infra. For traditional builds, this is OK, because the value does not change across packages. However, for builds with per-package directories, this value only refers to the generic path, which ill not exist until the end of the build when all packages are aggregated in the host-finalize step. Fix that by postponing the variable evaluation like all the others. Reported-by: Xogium on IRC Signed-off-by: Yann E. MORIN --- package/pkg-meson.mk | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk index de0e6e8ea3..aafb441fae 100644 --- a/package/pkg-meson.mk +++ b/package/pkg-meson.mk @@ -82,8 +82,8 @@ define $(2)_CONFIGURE_CMDS package/meson/cross-compilation.conf.in \ > $$($$(PKG)_SRCDIR)/build/cross-compilation.conf PATH=$$(BR_PATH) \ - CC_FOR_BUILD="$(HOSTCC)" \ - CXX_FOR_BUILD="$(HOSTCC)" \ + CC_FOR_BUILD="$$(HOSTCC)" \ + CXX_FOR_BUILD="$$(HOSTCC)" \ $$($$(PKG)_CONF_ENV) \ $$(MESON) \ --prefix=/usr \ -- 2.30.2