summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlexander Kanavin <alex.kanavin@gmail.com>2019-07-30 17:54:26 +0200
committerRichard Purdie <richard.purdie@linuxfoundation.org>2019-08-03 23:56:00 +0100
commit6acb599395853276dfdc6ab9b918c224c76351e7 (patch)
tree7a3ff2acff7e20d7744c41246cadda8d0d48d3c4
parent0aa7a34141807ea73d31374e1431bb0bc78b8f11 (diff)
downloadopenembedded-core-contrib-6acb599395853276dfdc6ab9b918c224c76351e7.tar.gz
meson.bbclass: do not pass native compiler/linker flags via command line
With 0.51.0 version these command line options override what is in the cross file (e.g. the cross-flags). I could not determine what is the scenario when the native flags are needed (this would be building a native binary in the context of cross build). If we find such a scenario we would need to find a way to pass native flags through some other channel. (From OE-Core rev: 6239b77c78b4b584274019130b715f21ac9defdf) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
-rw-r--r--meta/classes/meson.bbclass6
1 files changed, 1 insertions, 5 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass
index 626b0e789b..dafdd18bf4 100644
--- a/meta/classes/meson.bbclass
+++ b/meta/classes/meson.bbclass
@@ -24,11 +24,7 @@ MESONOPTS = " --prefix ${prefix} \
--infodir ${@noprefix('infodir', d)} \
--sysconfdir ${sysconfdir} \
--localstatedir ${localstatedir} \
- --sharedstatedir ${sharedstatedir} \
- -Dc_args='${BUILD_CPPFLAGS} ${BUILD_CFLAGS}' \
- -Dc_link_args='${BUILD_LDFLAGS}' \
- -Dcpp_args='${BUILD_CPPFLAGS} ${BUILD_CXXFLAGS}' \
- -Dcpp_link_args='${BUILD_LDFLAGS}'"
+ --sharedstatedir ${sharedstatedir} "
EXTRA_OEMESON_append = " ${PACKAGECONFIG_CONFARGS}"