[patch] CPP for multilib.eclass

multilib-cpp.patch (text/plain), 938 bytes, created by Denis Kaganovich on 2016-01-16 15:03:28 UTC

--- a/multilib.eclass	2016-01-16 17:11:09.000000000 +0300
+++ b/multilib.eclass	2016-01-16 17:35:04.000000000 +0300
@@ -429,7 +429,7 @@ multilib_toolchain_setup() {
 	# 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 AS CC CXX CPP F77 FC LD PKG_CONFIG_{LIBDIR,PATH} ; do
 			vv="_abi_saved_${v}"
 			[[ ${!v+set} == "set" ]] && export ${vv}="${!v}" || unset ${vv}
 		done
@@ -440,6 +440,7 @@ multilib_toolchain_setup() {
 		export CHOST=$(get_abi_CHOST ${DEFAULT_ABI})
 		export CC="$(tc-getCC) $(get_abi_CFLAGS)"
 		export CXX="$(tc-getCXX) $(get_abi_CFLAGS)"
+		export CPP="$(tc-getCPP)"
 		export F77="$(tc-getF77) $(get_abi_CFLAGS)"
 		export FC="$(tc-getFC) $(get_abi_CFLAGS)"
 		export LD="$(tc-getLD) $(get_abi_LDFLAGS)"