[gentoo-commits] repo/gentoo:master commit in: eclass/

[Mike Gilbert]

commit:     cbeeaff9e92cd67e100e5810ce1cf5d075d3f438
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Sun May  3 17:46:50 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Sun May  3 17:54:46 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cbeeaff9

meson.eclass: avoid leaking BUILD vars outside meson_src_configure

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 eclass/meson.eclass | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index 17875d97c47..773413bb602 100644
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -287,13 +287,26 @@ meson_feature() {
 meson_src_configure() {
        debug-print-function ${FUNCNAME} "$@"
 
-       tc-export_build_env
+       local BUILD_CFLAGS=${BUILD_CFLAGS}
+       local BUILD_CPPFLAGS=${BUILD_CPPFLAGS}
+       local BUILD_CXXFLAGS=${BUILD_CXXFLAGS}
+       local BUILD_FCFLAGS=${BUILD_FCFLAGS}
+       local BUILD_OBJCFLAGS=${BUILD_OBJCFLAGS}
+       local BUILD_OBJCXXFLAGS=${BUILD_OBJCXXFLAGS}
+       local BUILD_LDFLAGS=${BUILD_LDFLAGS}
+
        if tc-is-cross-compiler; then
+               : ${BUILD_CFLAGS:=-O1 -pipe}
+               : ${BUILD_CXXFLAGS:=-O1 -pipe}
                : ${BUILD_FCFLAGS:=-O1 -pipe}
                : ${BUILD_OBJCFLAGS:=-O1 -pipe}
                : ${BUILD_OBJCXXFLAGS:=-O1 -pipe}
        else
+               : ${BUILD_CFLAGS:=${CFLAGS}}
+               : ${BUILD_CPPFLAGS:=${CPPFLAGS}}
+               : ${BUILD_CXXFLAGS:=${CXXFLAGS}}
                : ${BUILD_FCFLAGS:=${FCFLAGS}}
+               : ${BUILD_LDFLAGS:=${LDFLAGS}}
                : ${BUILD_OBJCFLAGS:=${OBJCFLAGS}}
                : ${BUILD_OBJCXXFLAGS:=${OBJCXXFLAGS}}
        fi