From d797a28c901c6262835b3a1d29ad8e192e9c1ecd Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Sun, 3 May 2020 13:25:56 -0400 Subject: [PATCH] meson.eclass: use export -n instead of unset This ensures the variables are still availble if the configure function is called more than once, as would happen for a multilib build. Bug: https://bugs.gentoo.org/720818 Signed-off-by: Mike Gilbert --- eclass/meson.eclass | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/eclass/meson.eclass b/eclass/meson.eclass index 4367156b6198..17875d97c47b 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -346,7 +346,7 @@ meson_src_configure() { python_export_utf8_locale # https://bugs.gentoo.org/720818 - unset {C,CPP,CXX,F,FC,OBJC,OBJCXX,LD}FLAGS + export -n {C,CPP,CXX,F,FC,OBJC,OBJCXX,LD}FLAGS echo "${mesonargs[@]}" >&2 "${mesonargs[@]}" || die -- 2.26.2