summaryrefslogtreecommitdiff
path: root/eclass
diff options
context:
space:
mode:
authorEli Schwartz <eschwartz93@gmail.com>2024-03-01 15:47:45 -0500
committerSam James <sam@gentoo.org>2024-03-01 20:50:31 +0000
commitf2e1792ded67e62edc85e92e84f65d773a8f05bd (patch)
treec140ba2d47f9ce44051b3a51c041f02d481482ab /eclass
parentsys-kernel/gentoo-kernel-bin: Bump to 6.7.7 (diff)
downloadgentoo-f2e1792ded67e62edc85e92e84f65d773a8f05bd.tar.gz
gentoo-f2e1792ded67e62edc85e92e84f65d773a8f05bd.tar.bz2
gentoo-f2e1792ded67e62edc85e92e84f65d773a8f05bd.zip
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 <eschwartz93@gmail.com> Signed-off-by: Sam James <sam@gentoo.org>
Diffstat (limited to 'eclass')
-rw-r--r--eclass/meson.eclass4
1 files changed, 2 insertions, 2 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 9e877be53309..3bf0ba9ebe97 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+=(