From 6185541e3ceaa7471381709cf2fd1e1d51538e8b Mon Sep 17 00:00:00 2001 From: Sergei Trofimovich Date: Sun, 24 May 2020 19:56:49 +0100 Subject: multilib.eclass: don't backup/restore AS Not needed since Oct 27 2011, commit b0ab4faaee818c7bd5 ("drop AS export since get_abi_ASFLAGS no longer exists"), Signed-off-by: Sergei Trofimovich --- eclass/multilib.eclass | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) (limited to 'eclass/multilib.eclass') diff --git a/eclass/multilib.eclass b/eclass/multilib.eclass index acfb78deab1f..857829dd17b2 100644 --- a/eclass/multilib.eclass +++ b/eclass/multilib.eclass @@ -458,7 +458,7 @@ multilib_toolchain_setup() { # First restore any saved state we have laying around. if [[ ${_DEFAULT_ABI_SAVED} == "true" ]] ; then - for v in CHOST CBUILD AS CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do + for v in CHOST CBUILD CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do vv="_abi_saved_${v}" [[ ${!vv+set} == "set" ]] && export ${v}="${!vv}" || unset ${v} unset ${vv} @@ -466,11 +466,9 @@ multilib_toolchain_setup() { unset _DEFAULT_ABI_SAVED fi - # We want to avoid the behind-the-back magic of gcc-config as it - # screws up ccache and distcc. See #196243 for more info. if [[ ${ABI} != ${DEFAULT_ABI} ]] ; then # Back that multilib-ass up so we can restore it later - for v in CHOST CBUILD AS CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do + for v in CHOST CBUILD CC CXX F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do vv="_abi_saved_${v}" [[ ${!v+set} == "set" ]] && export ${vv}="${!v}" || unset ${vv} done -- cgit v1.2.3-65-gdbad