From c94ec42af76b5aab985bc41bfe24f37ae36d90b1 Mon Sep 17 00:00:00 2001
From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Fri, 31 Aug 2018 11:30:39 +1000
Subject: [PATCH] do_last_build: move some builds to standard cross compilers

---
 do_last_build | 27 +++++++++++++--------------
 1 file changed, 13 insertions(+), 14 deletions(-)

diff --git a/do_last_build b/do_last_build
index 15e84a8..64e7585 100755
--- a/do_last_build
+++ b/do_last_build
@@ -22,19 +22,19 @@ $cmd <<-EOF
 	touch .scmversion
 
 	echo Building: x86_64 modules_install
-	INSTALL_MOD_PATH="${build_dir%/*}" /usr/bin/time cross -n -N -a x86_64 -c $gcc_version O=../x86_64_allmodconfig -j$j_factor -O -s modules_install
+	INSTALL_MOD_PATH="${build_dir%/*}" /usr/bin/time make ARCH=x86_64 CROSS_COMPILE=x86_64-linux-gnu- O=../x86_64_allmodconfig -j$j_factor -O -s modules_install
 
 	echo Building: x86_64 allnoconfig
 	d=../x86_64_allnoconfig
 	[ -d \$d ] || mkdir \$d
-	cross -n -N -a x86_64 -c $gcc_version -s O=\$d allnoconfig
-	cross -n -N -a x86_64 -c $gcc_version O=\$d -j$j_factor -O -s
+	make ARCH=x86_64 O=\$d CROSS_COMPILE=x86_64-linux-gnu- -s allnoconfig
+	make ARCH=x86_64 O=\$d CROSS_COMPILE=x86_64-linux-gnu- -j$j_factor -O -s
 
 	echo Building: powerpc allnoconfig
 	d=../powerpc_allnoconfig
 	[ -d \$d ] || mkdir \$d
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version -s O=\$d allnoconfig
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version O=\$d -j$j_factor -O -s
+	make ARCH=powerpc -s O=\$d allnoconfig
+	make ARCH=powerpc O=\$d -j$j_factor -O -s
 
 	echo Building: powerpc64 allnoconfig
 	d=../powerpc64_allnoconfig
@@ -42,28 +42,27 @@ $cmd <<-EOF
 	e=\$d.except
 	echo CONFIG_PPC64=y >\$e
 	echo CONFIG_SECTION_MISMATCH_WARN_ONLY=y >>\$e
-	KCONFIG_ALLCONFIG=\$e \
-		cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version -s O=\$d allnoconfig
+	KCONFIG_ALLCONFIG=\$e make ARCH=powerpc -s O=\$d allnoconfig
 	rm \$e
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version O=\$d -j$j_factor -O -s
+	make ARCH=powerpc O=\$d -j$j_factor -O -s
 
 	echo Building: powerpc ppc44x_defconfig
 	d=../powerpc_ppc44x_defconfig
 	[ -d \$d ] || mkdir \$d
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version -s O=\$d ppc44x_defconfig
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version O=\$d -j$j_factor -O -s
+	make ARCH=powerpc -s O=\$d ppc44x_defconfig
+	make ARCH=powerpc O=\$d -j$j_factor -O -s
 
 	echo Building: powerpc allyesconfig
 	d=../powerpc_allyesconfig
 	[ -d \$d ] || mkdir \$d
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version -s O=\$d allyesconfig
-	cross -n -N -k powerpc -a powerpc64 -c $gcc_ppc_version -- O=\$d -j$j_factor -O -s -k
+	make ARCH=powerpc -s O=\$d allyesconfig
+	make ARCH=powerpc O=\$d -j$j_factor -O -s -k
 
 	echo Building: powerpc pseries_le_defconfig
 	d=../powerpc_pseries_le_defconfig
 	[ -d \$d ] || mkdir \$d
-	cross -n -N -k powerpc -a powerpc64le -c $gcc_ppcle_version -s O=\$d pseries_le_defconfig
-	cross -n -N -k powerpc -a powerpc64le -c $gcc_ppcle_version -- O=\$d -j$j_factor -O -s
+	make ARCH=powerpc -s O=\$d pseries_le_defconfig
+	make ARCH=powerpc O=\$d -j$j_factor -O -s
 
 	rm .scmversion
 EOF
-- 
2.39.2