multilib.eclass: save/restore AR, NM, RANLIB, OBJDUMP, STRIP, bug #724558

A follow-up to commit dd35b529194fdc
("populate AR, NM, RANLIB, OBJDUMP, STRIP, bug #724558")

Before the change AR and friends were set for non-default ABI
and were not restored to defaults for next native ABI.

It should not be a problem for default case as both do match.
For consistency with other variables now we restore possibly
unset values for native ABI.

Noticed by Arfrever Frehtes Taifersar Arahesis.

Reported-by: Arfrever Frehtes Taifersar Arahesis
Bug: https://bugs.gentoo.org/724558
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>

diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index e13aae2bb7f7dc7bcb8e6ed5e333bf90435bb2e6..b79718bb193e1f9c657b0823e6d82e5b2b7e9352 100644 (file)
--- a/eclass/multilib.eclass
+++ b/eclass/multilib.eclass
@@ -459,11 +459,16 @@ multilib_toolchain_setup() {
        local save_restore_variables=(
                CBUILD
                CHOST
+               AR
                CC
                CXX
                F77
                FC
                LD
+               NM
+               OBJDUMP
+               RANLIB
+               STRIP
                PKG_CONFIG_LIBDIR
                PKG_CONFIG_PATH
        )