summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Trofimovich <slyfox@gentoo.org>2020-05-24 21:40:50 +0100
committerSergei Trofimovich <slyfox@gentoo.org>2020-05-24 22:03:30 +0100
commit1975b0bb9e07557c0a7b06c53b4e78950fe46eda (patch)
tree79f7f0348f505e85f1b22165ff4f9b837f35ba05
parentmultilib.eclass: consolidate save/restore list (diff)
downloadgentoo-1975b0bb9e07557c0a7b06c53b4e78950fe46eda.tar.gz
gentoo-1975b0bb9e07557c0a7b06c53b4e78950fe46eda.tar.bz2
gentoo-1975b0bb9e07557c0a7b06c53b4e78950fe46eda.zip
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>
-rw-r--r--eclass/multilib.eclass5
1 files changed, 5 insertions, 0 deletions
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
)