commit:     d797a28c901c6262835b3a1d29ad8e192e9c1ecd
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May  3 17:25:56 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May  3 17:25:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d797a28c

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 <floppym <AT> gentoo.org>

 eclass/meson.eclass | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 4367156b619..17875d97c47 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

Reply via email to