commit: 1975b0bb9e07557c0a7b06c53b4e78950fe46eda
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
AuthorDate: Sun May 24 20:40:50 2020 +0000
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org>
CommitDate: Sun May 24 21:03:30 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1975b0bb
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 <AT> gentoo.org>
eclass/multilib.eclass | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass
index e13aae2bb7f..b79718bb193 100644
--- 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
)
