allow for different compiler versions for ppc and ppcle

diff --git a/common.sh b/common.sh
index e3e220925fc2e219772e35b8f3cffa7a4948b32a..cb720a87adcfba4d6ec7e820aae6af3cb1217127 100644 (file)
--- 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 51bea9c34c0b019272cdd6d4a6333953989710fd..4a5e2c385786b822bf7ced398b3787d2e75a22a6 100755 (executable)
--- 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 5c848c6bfec8808b1a5ef11d2c4e5745448878a4..8d679112a23db0bd0a515011c712c85484ce6695 100755 (executable)
--- 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