[gentoo-commits] repo/gentoo:master commit in: eclass/

[Ulrich Müller]

commit:     333d55fbc810077961b8fe346c8157ab25e13597
Author:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 27 07:24:58 2016 +0000
Commit:     Ulrich Müller <ulm <AT> gentoo <DOT> org>
CommitDate: Mon Jun 27 07:30:08 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=333d55fb

toolchain-funcs.eclass: Remove code that has become redundant.

After commit 81c226e451be564a545696f93fc5880ebc160812, type cannot be
"kern" in these two places, so ninj would always return its second
argument, i.e. it can be replaced by simple echo.

 eclass/toolchain-funcs.eclass | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/eclass/toolchain-funcs.eclass b/eclass/toolchain-funcs.eclass
index 2652e0e..2af9b02 100644
--- a/eclass/toolchain-funcs.eclass
+++ b/eclass/toolchain-funcs.eclass
@@ -497,8 +497,6 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; }
 				echo powerpc
 			elif [[ ${host} == powerpc64* ]] ; then
 				echo ppc64
-			elif [[ ${PROFILE_ARCH} == "ppc64" ]] ; then
-				ninj ppc64 ppc
 			else
 				echo ppc
 			fi
@@ -522,7 +520,7 @@ ninj() { [[ ${type} == "kern" ]] && echo $1 || echo $2 ; }
 			if [[ ${type} == "kern" ]] ; then
 				echo x86
 			else
-				ninj x86_64 amd64
+				echo amd64
 			fi
 			;;
 		xtensa*)	echo xtensa;;