diff options
| author |   Alexander Kanavin <alex.kanavin@gmail.com> | 2020-01-24 11:17:20 +0100 |
|---|---|---|
| committer |   Richard Purdie <richard.purdie@linuxfoundation.org> | 2020-01-27 16:38:54 +0000 |
| commit | e0e30637a139feb744ca284aa63d47efefc5cb5d (patch) | |
| tree | 1ed50b5911b798f424a60fcddf4b0d058950d09f /meta/classes/meson.bbclass | |
| parent | af299817c2fe9fa504762c54bd0593f3163399fb (diff) | |
| download | openembedded-core-contrib-e0e30637a139feb744ca284aa63d47efefc5cb5d.tar.gz | |
meson: update 0.52.1 -> 0.53.0
Unset LD, and do not set ld in cross file from LD as
new version of meson passes that value directly
to -fuse-ld=... which requires one of lld, bfd, gold.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/classes/meson.bbclass')
| -rw-r--r-- | meta/classes/meson.bbclass | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/meta/classes/meson.bbclass b/meta/classes/meson.bbclass index 9c3673ea42..001602bd04 100644 --- a/meta/classes/meson.bbclass +++ b/meta/classes/meson.bbclass @@ -91,7 +91,6 @@ c = ${@meson_array('CC', d)} cpp = ${@meson_array('CXX', d)} ar = ${@meson_array('AR', d)} nm = ${@meson_array('NM', d)} -ld = ${@meson_array('LD', d)} strip = ${@meson_array('STRIP', d)} readelf = ${@meson_array('READELF', d)} pkgconfig = 'pkg-config' @@ -122,6 +121,10 @@ EOF CONFIGURE_FILES = "meson.build" meson_do_configure() { + # Meson requires this to be 'bfd, 'lld' or 'gold' from 0.53 onwards + # https://github.com/mesonbuild/meson/commit/ef9aeb188ea2bc7353e59916c18901cde90fa2b3 + unset LD + # Work around "Meson fails if /tmp is mounted with noexec #2972" mkdir -p "${B}/meson-private/tmp" export TMPDIR="${B}/meson-private/tmp" |