meson.eclass: only default BUILD_FLAGS to FLAGS if not cross-compiling

Bug: https://bugs.gentoo.org/720818
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

diff --git a/eclass/meson.eclass b/eclass/meson.eclass
index dce5fffd894c3adf01698d43ba03ded6e5fda204..13daa961c7bdb68e409e6a46d78909749960c710 100644 (file)
--- a/eclass/meson.eclass
+++ b/eclass/meson.eclass
@@ -288,9 +288,15 @@ meson_src_configure() {
        debug-print-function ${FUNCNAME} "$@"
 
        tc-export_build_env
-       : ${BUILD_FCFLAGS:=${FCFLAGS}}
-       : ${BUILD_OBJCFLAGS:=${OBJCFLAGS}}
-       : ${BUILD_OBJCXXFLAGS:=${OBJCXXFLAGS}}
+       if tc-is-cross-compiler; then
+               : ${BUILD_FCFLAGS:=-O1 -pipe}
+               : ${BUILD_OBJCFLAGS:=-O1 -pipe}
+               : ${BUILD_OBJCXXFLAGS:=-O1 -pipe}
+       else
+               : ${BUILD_FCFLAGS:=${FCFLAGS}}
+               : ${BUILD_OBJCFLAGS:=${OBJCFLAGS}}
+               : ${BUILD_OBJCXXFLAGS:=${OBJCXXFLAGS}}
+       fi
 
        local mesonargs=(
                meson setup