mirror of
https://git.yoctoproject.org/poky
synced 2026-05-29 12:09:36 +00:00
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. (From OE-Core rev: e0e30637a139feb744ca284aa63d47efefc5cb5d) Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com> Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
This commit is contained in:
committed by
Richard Purdie
parent
22dd46cc34
commit
4821e629ef
@@ -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"
|
||||
|
||||
Reference in New Issue
Block a user