diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2020-05-03 11:18:12 -0400 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2020-05-03 11:18:12 -0400 |
| commit | 2c8d90f4ac9df93020014604a39cdca6b8356cce (patch) | |
| tree | 37957e694888a4b430d47fc5408418fddc79dd19 | |
| parent | dev-python/nose-exclude: ppc64 stable wrt bug #720548 (diff) | |
| download | gentoo-2c8d90f4.tar.gz gentoo-2c8d90f4.tar.bz2 gentoo-2c8d90f4.zip | |
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>
| -rw-r--r-- | eclass/meson.eclass | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index dce5fffd894c..13daa961c7bd 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 |