| 1 |
For both multilib and non-multilib profiles binutils provides |
| 2 |
tools with native ABI prefix only. For example on amd64 there |
| 3 |
is only 'x86_64-pc-linux-gnu-nm' and 'nm'. |
| 4 |
|
| 5 |
On abi_x86_32 tools are usually configured with --host=i686-pc-linux-gnu. |
| 6 |
Configure tries i686-pc-linux-gnu-nm, then falls back to 'nm'. |
| 7 |
|
| 8 |
The change overrides NM to 'x86_64-pc-linux-gnu-nm' for |
| 9 |
multilib setup similar to other environment variables. |
| 10 |
|
| 11 |
Reported-by: Kent Fredric |
| 12 |
Closes: https://bugs.gentoo.org/724558 |
| 13 |
Signed-off-by: Sergei Trofimovich <slyfox@g.o> |
| 14 |
--- |
| 15 |
eclass/multilib.eclass | 2 ++ |
| 16 |
1 file changed, 2 insertions(+) |
| 17 |
|
| 18 |
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass |
| 19 |
index bbaab709b4f..25e90dea44c 100644 |
| 20 |
--- a/eclass/multilib.eclass |
| 21 |
+++ b/eclass/multilib.eclass |
| 22 |
@@ -484,11 +484,13 @@ multilib_toolchain_setup() { |
| 23 |
# Set the CHOST native first so that we pick up the native |
| 24 |
# toolchain and not a cross-compiler by accident #202811. |
| 25 |
export CHOST=$(get_abi_CHOST ${DEFAULT_ABI}) |
| 26 |
+ export AR="$(tc-getAR)" # Avoid 'ar', use '${CHOST}-ar' |
| 27 |
export CC="$(tc-getCC) $(get_abi_CFLAGS)" |
| 28 |
export CXX="$(tc-getCXX) $(get_abi_CFLAGS)" |
| 29 |
export F77="$(tc-getF77) $(get_abi_CFLAGS)" |
| 30 |
export FC="$(tc-getFC) $(get_abi_CFLAGS)" |
| 31 |
export LD="$(tc-getLD) $(get_abi_LDFLAGS)" |
| 32 |
+ export NM="$(tc-getNM)" # Avoid 'nm', use '${CHOST}-nm' |
| 33 |
export CHOST=$(get_abi_CHOST $1) |
| 34 |
export PKG_CONFIG_LIBDIR=${EPREFIX}/usr/$(get_libdir)/pkgconfig |
| 35 |
export PKG_CONFIG_PATH=${EPREFIX}/usr/share/pkgconfig |
| 36 |
-- |
| 37 |
2.26.2 |
Archives