diff options
| author |   Sergei Trofimovich <slyfox@gentoo.org> | 2020-06-12 19:34:10 +0100 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2020-06-13 00:46:28 +0100 |
| commit | da03d40f146a646c38e75fd0a6fc299b5aeba505 (patch) | |
| tree | aa0bc721eaf0d24fd47f47c07bfbf67f84ddebe1 /eclass/meson.eclass | |
| parent | media-sound/musepack-tools: fix -fno-common build failure (diff) | |
| download | gentoo-da03d40f146a646c38e75fd0a6fc299b5aeba505.tar.gz gentoo-da03d40f146a646c38e75fd0a6fc299b5aeba505.tar.bz2 gentoo-da03d40f146a646c38e75fd0a6fc299b5aeba505.zip | |
meson.eclass: override 'nm' tool with tuple-prefixed one
x11-libs/libdrm and media-libs/libglvnd fail to find 'nm'
tool on sys-devel/binutils-config[-native-symlinks] system as:
`meson.build:40:0: ERROR: Program(s) ['nm'] not found or not executable`
It's caused by the code that locates the tool as:
`prog_nm = find_program('nm')`.
The change adds 'nm' tool along with other binutils tools.
Closes: https://bugs.gentoo.org/720886
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'eclass/meson.eclass')
| -rw-r--r-- | eclass/meson.eclass | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/eclass/meson.eclass b/eclass/meson.eclass index e79faa1beea3..1590c1f14cf5 100644 --- a/eclass/meson.eclass +++ b/eclass/meson.eclass @@ -178,6 +178,7 @@ _meson_create_cross_file() { cpp = $(_meson_env_array "$(tc-getCXX)") fortran = $(_meson_env_array "$(tc-getFC)") llvm-config = '$(tc-getPROG LLVM_CONFIG llvm-config)' + nm = $(_meson_env_array "$(tc-getNM)") objc = $(_meson_env_array "$(tc-getPROG OBJC cc)") objcpp = $(_meson_env_array "$(tc-getPROG OBJCXX c++)") pkgconfig = '$(tc-getPKG_CONFIG)' @@ -228,6 +229,7 @@ _meson_create_native_file() { cpp = $(_meson_env_array "$(tc-getBUILD_CXX)") fortran = $(_meson_env_array "$(tc-getBUILD_PROG FC gfortran)") llvm-config = '$(tc-getBUILD_PROG LLVM_CONFIG llvm-config)' + nm = $(_meson_env_array "$(tc-getBUILD_NM)") objc = $(_meson_env_array "$(tc-getBUILD_PROG OBJC cc)") objcpp = $(_meson_env_array "$(tc-getBUILD_PROG OBJCXX c++)") pkgconfig = '$(tc-getBUILD_PKG_CONFIG)' |