From 1a7d99e623f4f69f92dd4ff6663dfcb729039a33 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Thu, 8 Oct 2015 16:45:40 +1100
Subject: [PATCH] allow for different compiler versions for ppc and ppcle

---
 common.sh     |  4 ++++
 do_build      |  4 ++--
 do_last_build | 20 ++++++++++----------
 3 files changed, 16 insertions(+), 12 deletions(-)

diff --git a/common.sh b/common.sh
index e3e2209..cb720a8 100644
--- a/common.sh
+++ b/common.sh
@@ -25,6 +25,10 @@ gpg_key=41D5C07A
 }
 [ "$NEXT_BUILD_DIR" ] && build_dir="$NEXT_BUILD_DIR"
 [ "$NEXT_GCC_VERSION" ] && gcc_version="$NEXT_GCC_VERSION"
+gcc_ppc_version=$gcc_version
+[ "$NEXT_GCC_PPC_VERSION" ] && gcc_ppc_version="$NEXT_GCC_PPC_VERSION"
+gcc_ppcle_version=$gcc_ppc_version
+[ "$NEXT_GCC_PPCLE_VERSION" ] && gcc_ppcle_version="$NEXT_GCC_PPCLE_VERSION"
 [ "$NEXT_J_FACTOR" ] && j_factor="$NEXT_J_FACTOR"
 
 [ -n "$1" ] && {
diff --git a/do_build b/do_build
index 51bea9c..4a5e2c3 100755
--- a/do_build
+++ b/do_build
@@ -41,9 +41,9 @@ $cmd <<-EOF
 	d="$bparent/powerpc_ppc64_defconfig"
 	[ -d \$d ] || mkdir \$d || exit 1
 	log_ppc=\$d.log
-	cross -n -N -a powerpc64 -k powerpc -c $gcc_version O=\$d ppc64_defconfig || exit 1
+	cross -n -N -a powerpc64 -k powerpc -c $gcc_ppc_version O=\$d ppc64_defconfig || exit 1
 	echo "Forking powerpc build ..."
-	/usr/bin/time cross -n -N -a powerpc64 -k powerpc -c $gcc_version O=\$d -j$j_factor -s > \$log_ppc 2>&1 &
+	/usr/bin/time cross -n -N -a powerpc64 -k powerpc -c $gcc_ppc_version O=\$d -j$j_factor -s > \$log_ppc 2>&1 &
 	ppc64_pid=\$!
 
 	echo Building: arm multi_v7_defconfig
diff --git a/do_last_build b/do_last_build
index 5c848c6..8d67911 100755
--- a/do_last_build
+++ b/do_last_build
@@ -24,8 +24,8 @@ $cmd <<-EOF
 	echo Building: powerpc allnoconfig
 	d=../powerpc_allnoconfig
 	[ -d \$d ] || mkdir \$d
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_version O=\$d allnoconfig
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_version O=\$d -j48 -s
+	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version O=\$d allnoconfig
+	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version O=\$d -j48 -s
 
 	echo Building: powerpc64 allnoconfig
 	d=../powerpc64_allnoconfig
@@ -33,27 +33,27 @@ $cmd <<-EOF
 	e=\$d.except
 	echo CONFIG_PPC64=y >\$e
 	KCONFIG_ALLCONFIG=\$e \
-		cross -n -N -k powerpc -a powerpc64 -c $gcc_version O=\$d allnoconfig
+		cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version O=\$d allnoconfig
 	rm \$e
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_version O=\$d -j48 -s
+	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version O=\$d -j48 -s
 
 	echo Building: powerpc ppc44x_defconfig
 	d=../powerpc_ppc44x_defconfig
 	[ -d \$d ] || mkdir \$d
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_version O=\$d ppc44x_defconfig
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_version O=\$d -j48 -s
+	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version O=\$d ppc44x_defconfig
+	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version O=\$d -j48 -s
 
 	echo Building: powerpc allyesconfig
 	d=../powerpc_allyesconfig
 	[ -d \$d ] || mkdir \$d
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_version O=\$d allyesconfig
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_version -- O=\$d -j48 -s -k || true
+	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version O=\$d allyesconfig
+	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version -- O=\$d -j48 -s -k || true
 
 	echo Building: powerpc pseries_le_defconfig
 	d=../powerpc_pseries_le_defconfig
 	[ -d \$d ] || mkdir \$d
-	cross -n -N -k powerpc -a powerpc64le -c 5.2.0 O=\$d pseries_le_defconfig
-	cross -n -N -k powerpc -a powerpc64le -c 5.2.0 -- O=\$d -j48 -s
+	cross -n -N -k powerpc -a powerpc64le -c $gcc_ppcle_version O=\$d pseries_le_defconfig
+	cross -n -N -k powerpc -a powerpc64le -c $gcc_ppcle_version -- O=\$d -j48 -s
 
 	rm .scmversion
 EOF
-- 
2.39.2