From f2e1792ded67e62edc85e92e84f65d773a8f05bd Mon Sep 17 00:00:00 2001 From: Eli Schwartz Date: Fri, 1 Mar 2024 15:47:45 -0500 Subject: [PATCH] meson.eclass: fix setting BUILD_DIR after the lto refactor BUILD_DIR is an eclass variable and should be publicly, globally set. Closes: https://bugs.gentoo.org/925939 Signed-off-by: Eli Schwartz Signed-off-by: Sam James --- eclass/meson.eclass | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 9e877be53309c..3bf0ba9ebe97e 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -374,8 +374,6 @@ setup_meson_src_configure() { MESONARGS+=( --cross-file "$(_meson_create_cross_file)" ) fi - BUILD_DIR="${BUILD_DIR:-${WORKDIR}/${P}-build}" - # Handle quoted whitespace eval "local -a MYMESONARGS=( ${MYMESONARGS} )" @@ -412,6 +410,8 @@ meson_src_configure() { [[ -n "${NINJA_DEPEND}" ]] || ewarn "Unknown value '${NINJA}' for \${NINJA}" + BUILD_DIR="${BUILD_DIR:-${WORKDIR}/${P}-build}" + ( setup_meson_src_configure "$@" MESONARGS+=(