multilib.eclass: don't backup/restore AS
authorSergei Trofimovich <slyfox@gentoo.org>
Sun, 24 May 2020 18:56:49 +0000 (19:56 +0100)
committerSergei Trofimovich <slyfox@gentoo.org>
Sun, 24 May 2020 21:03:29 +0000 (22:03 +0100)
Not needed since Oct 27 2011, commit b0ab4faaee818c7bd5
("drop AS export since get_abi_ASFLAGS no longer exists"),

Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
eclass/multilib.eclass

index acfb78deab1f73254e8fd2c34c36a6b31c6e1964..857829dd17b256a8a08636db899914dfdb311fe4 100644 (file)
@@ -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