| 1 |
commit: 1975b0bb9e07557c0a7b06c53b4e78950fe46eda |
| 2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sun May 24 20:40:50 2020 +0000 |
| 4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun May 24 21:03:30 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1975b0bb |
| 7 |
|
| 8 |
multilib.eclass: save/restore AR, NM, RANLIB, OBJDUMP, STRIP, bug #724558 |
| 9 |
|
| 10 |
A follow-up to commit dd35b529194fdc |
| 11 |
("populate AR, NM, RANLIB, OBJDUMP, STRIP, bug #724558") |
| 12 |
|
| 13 |
Before the change AR and friends were set for non-default ABI |
| 14 |
and were not restored to defaults for next native ABI. |
| 15 |
|
| 16 |
It should not be a problem for default case as both do match. |
| 17 |
For consistency with other variables now we restore possibly |
| 18 |
unset values for native ABI. |
| 19 |
|
| 20 |
Noticed by Arfrever Frehtes Taifersar Arahesis. |
| 21 |
|
| 22 |
Reported-by: Arfrever Frehtes Taifersar Arahesis |
| 23 |
Bug: https://bugs.gentoo.org/724558 |
| 24 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
| 25 |
|
| 26 |
eclass/multilib.eclass | 5 +++++ |
| 27 |
1 file changed, 5 insertions(+) |
| 28 |
|
| 29 |
diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass |
| 30 |
index e13aae2bb7f..b79718bb193 100644 |
| 31 |
--- a/eclass/multilib.eclass |
| 32 |
+++ b/eclass/multilib.eclass |
| 33 |
@@ -459,11 +459,16 @@ multilib_toolchain_setup() { |
| 34 |
local save_restore_variables=( |
| 35 |
CBUILD |
| 36 |
CHOST |
| 37 |
+ AR |
| 38 |
CC |
| 39 |
CXX |
| 40 |
F77 |
| 41 |
FC |
| 42 |
LD |
| 43 |
+ NM |
| 44 |
+ OBJDUMP |
| 45 |
+ RANLIB |
| 46 |
+ STRIP |
| 47 |
PKG_CONFIG_LIBDIR |
| 48 |
PKG_CONFIG_PATH |
| 49 |
) |
Archives