meson.eclass: use export -n instead of unset
authorMike Gilbert <floppym@gentoo.org>
Sun, 3 May 2020 17:25:56 +0000 (13:25 -0400)
committerMike Gilbert <floppym@gentoo.org>
Sun, 3 May 2020 17:25:56 +0000 (13:25 -0400)
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@gentoo.org>
eclass/meson.eclass

index 4367156b619886c1550460ffd4aee6ce4b6040a4..17875d97c47bf1aea8bf02b83a7197bcbc3aa3ef 100644 (file)
@@ -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