| 1 |
commit: d797a28c901c6262835b3a1d29ad8e192e9c1ecd |
| 2 |
Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 3 17:25:56 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 3 17:25:56 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d797a28c |
| 7 |
|
| 8 |
meson.eclass: use export -n instead of unset |
| 9 |
|
| 10 |
This ensures the variables are still availble if the configure function is |
| 11 |
called more than once, as would happen for a multilib build. |
| 12 |
|
| 13 |
Bug: https://bugs.gentoo.org/720818 |
| 14 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 15 |
|
| 16 |
eclass/meson.eclass | 2 +- |
| 17 |
1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 |
|
| 19 |
diff --git a/eclass/meson.eclass b/eclass/meson.eclass |
| 20 |
index 4367156b619..17875d97c47 100644 |
| 21 |
--- a/eclass/meson.eclass |
| 22 |
+++ b/eclass/meson.eclass |
| 23 |
@@ -346,7 +346,7 @@ meson_src_configure() { |
| 24 |
python_export_utf8_locale |
| 25 |
|
| 26 |
# https://bugs.gentoo.org/720818 |
| 27 |
- unset {C,CPP,CXX,F,FC,OBJC,OBJCXX,LD}FLAGS |
| 28 |
+ export -n {C,CPP,CXX,F,FC,OBJC,OBJCXX,LD}FLAGS |
| 29 |
|
| 30 |
echo "${mesonargs[@]}" >&2 |
| 31 |
"${mesonargs[@]}" || die |
Archives