commit: 2c8d90f4ac9df93020014604a39cdca6b8356cce Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun May 3 15:18:12 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun May 3 15:18:12 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c8d90f4
meson.eclass: only default BUILD_FLAGS to FLAGS if not cross-compiling Bug: https://bugs.gentoo.org/720818 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> eclass/meson.eclass | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/eclass/meson.eclass b/eclass/meson.eclass index dce5fffd894..13daa961c7b 100644 --- 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
