aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2021-02-02 21:32:23 +0100
committerGravatar Peter Korsgaard <peter@korsgaard.com>2021-02-04 17:52:02 +0100
commita7a6b6be72b7e637f8b1fa64066ed7eaa9597f5e (patch)
tree624abf81e8f99b8e315f369b3461ef7ee5665665
parentba897ff2443b677c42befa191840f963e3f0b495 (diff)
downloadbuildroot-a7a6b6be72b7e637f8b1fa64066ed7eaa9597f5e.tar.gz
buildroot-a7a6b6be72b7e637f8b1fa64066ed7eaa9597f5e.tar.bz2
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 <yann.morin.1998@free.fr> (cherry picked from commit 548b8c541285cedc390c4c95bd9d80dbad7d2a73) Signed-off-by: Peter Korsgaard <peter@korsgaard.com>
-rw-r--r--package/pkg-meson.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/package/pkg-meson.mk b/package/pkg-meson.mk
index e49aca055f..5c4598eb00 100644
--- a/package/pkg-meson.mk
+++ b/package/pkg-meson.mk
@@ -81,8 +81,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 \