From e8641c526dff56dc1c4799f86cabab88736c8ca6 Mon Sep 17 00:00:00 2001
From: NicJA <NicJA@fb15a70f-31f2-0310-bbcc-cdcc74a49acc>
Date: Wed, 19 Apr 2017 18:49:38 +0000
Subject: [PATCH] store the target cpu in BUILDCPU. Check if the toolchain
 exists before trying to use it to build AROS.

git-svn-id: https://svn.aros.org/svn/aros/trunk/AROS@54563 fb15a70f-31f2-0310-bbcc-cdcc74a49acc
---
 scripts/nightly/pkg/bootiso                       | 10 +++++++++-
 scripts/nightly/pkg/bootiso-Parthenope-sam440-ppc |  3 ++-
 scripts/nightly/pkg/bootiso-grub-pc-i386          |  3 ++-
 scripts/nightly/pkg/bootiso-grub2-pc-i386         |  3 ++-
 scripts/nightly/pkg/bootiso-grub2-pc-x86_64       |  3 ++-
 scripts/nightly/pkg/bootiso-grub2-pc-x86_64-smp   |  3 ++-
 scripts/nightly/pkg/bootiso-ub2lb-efika-ppc       |  3 ++-
 7 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/scripts/nightly/pkg/bootiso b/scripts/nightly/pkg/bootiso
index 50ce6fcc7a..63ed239683 100644
--- a/scripts/nightly/pkg/bootiso
+++ b/scripts/nightly/pkg/bootiso
@@ -4,6 +4,8 @@
 BOOTLOADER=$1
 WITHCONTRIB=$2
 
+CONFIGURE_OPTIONS=
+
 TARGET=$BUILDTARGET
 if [[ "$VARIANT" != "" ]]; then
     BUILDTARGET=$VARIANT-$TARGET
@@ -24,8 +26,14 @@ if [[ "$WITHCONTRIB" != "no" ]]; then
     copy    $SOURCE_CONTRIB $BUILD_BASE/AROS/contrib
 fi
 
+CONFIGURE_OPTIONS="--target=$TARGET --enable-target-variant=$VARIANT $CONFIGUREEXTRA --enable-ccache"
+if [[ ( "$AROSTOOLCHAININSTALLOPT" != "" ) && -e  $TOOLCHAIN_BASE/$BUILDCPU-aros-gcc ]]; then
+     CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS $AROSTOOLCHAININSTALLOPT $AROSTOOLCHAINOPT"
+fi
+CONFIGURE_OPTIONS="$CONFIGURE_OPTIONS --with-bootloader=$BOOTLOADER --enable-build-type=nightly $PORTSSOURCESOPT"
+
 cd      $BUILD_BASE/AROS
-execute ./configure --target=$TARGET --enable-target-variant=$VARIANT $CONFIGUREEXTRA --enable-ccache --with-bootloader=$BOOTLOADER --enable-build-type=nightly $PORTSSOURCESOPT $AROSTOOLCHAININSTALLOPT $AROSTOOLCHAINOPT
+execute ./configure $CONFIGURE_OPTIONS
 make    -j $MAKE_JOBS
 if [[ "$WITHCONTRIB" != "no" ]]; then
     make    -j $MAKE_JOBS contrib
diff --git a/scripts/nightly/pkg/bootiso-Parthenope-sam440-ppc b/scripts/nightly/pkg/bootiso-Parthenope-sam440-ppc
index 47b0cf95b5..3c6944ae21 100644
--- a/scripts/nightly/pkg/bootiso-Parthenope-sam440-ppc
+++ b/scripts/nightly/pkg/bootiso-Parthenope-sam440-ppc
@@ -1,7 +1,8 @@
 #!/bin/zsh
 # Creates AROS/sam440-ppc bootiso binary packages.
 
-BUILDTARGET=sam440-ppc
+BUILDCPU=ppc
+BUILDTARGET=sam440-$BUILDCPU
 BOOTLOADER=Parthenope
 
 source $SP/pkg/bootiso $BOOTLOADER yes
diff --git a/scripts/nightly/pkg/bootiso-grub-pc-i386 b/scripts/nightly/pkg/bootiso-grub-pc-i386
index 64cb4068e2..a3cd90445f 100644
--- a/scripts/nightly/pkg/bootiso-grub-pc-i386
+++ b/scripts/nightly/pkg/bootiso-grub-pc-i386
@@ -1,7 +1,8 @@
 #!/bin/zsh
 # Creates AROS/pc-i386 grub bootiso binary packages.
 
-BUILDTARGET=pc-i386
+BUILDCPU=i386
+BUILDTARGET=pc-$BUILDCPU
 BOOTLOADER=grub
 
 source $SP/pkg/bootiso $BOOTLOADER yes
diff --git a/scripts/nightly/pkg/bootiso-grub2-pc-i386 b/scripts/nightly/pkg/bootiso-grub2-pc-i386
index cc8db8a560..cb3df0cfe8 100755
--- a/scripts/nightly/pkg/bootiso-grub2-pc-i386
+++ b/scripts/nightly/pkg/bootiso-grub2-pc-i386
@@ -1,7 +1,8 @@
 #!/bin/zsh
 # Creates AROS/pc-i386 grub2 bootiso binary packages.
 
-BUILDTARGET=pc-i386
+BUILDCPU=i386
+BUILDTARGET=pc-$BUILDCPU
 BOOTLOADER=grub2
 
 source $SP/pkg/bootiso $BOOTLOADER yes
diff --git a/scripts/nightly/pkg/bootiso-grub2-pc-x86_64 b/scripts/nightly/pkg/bootiso-grub2-pc-x86_64
index 12eeb59476..a3628e2da1 100755
--- a/scripts/nightly/pkg/bootiso-grub2-pc-x86_64
+++ b/scripts/nightly/pkg/bootiso-grub2-pc-x86_64
@@ -3,7 +3,8 @@
 
 CONFIGUREEXTRA="--with-binutils-version=2.25 --with-gcc-version=6.3.0"
 
-BUILDTARGET=pc-x86_64
+BUILDCPU=x86_64
+BUILDTARGET=pc-$BUILDCPU
 BOOTLOADER=grub2
 
 source $SP/pkg/bootiso $BOOTLOADER yes
diff --git a/scripts/nightly/pkg/bootiso-grub2-pc-x86_64-smp b/scripts/nightly/pkg/bootiso-grub2-pc-x86_64-smp
index 9c19b8c74d..f7a73fe12b 100644
--- a/scripts/nightly/pkg/bootiso-grub2-pc-x86_64-smp
+++ b/scripts/nightly/pkg/bootiso-grub2-pc-x86_64-smp
@@ -3,7 +3,8 @@
 
 CONFIGUREEXTRA="--with-binutils-version=2.25 --with-gcc-version=6.3.0"
 
-BUILDTARGET=pc-x86_64
+BUILDCPU=x86_64
+BUILDTARGET=pc-$BUILDCPU
 VARIANT=smp
 BOOTLOADER=grub2
 
diff --git a/scripts/nightly/pkg/bootiso-ub2lb-efika-ppc b/scripts/nightly/pkg/bootiso-ub2lb-efika-ppc
index c8c8ba6eb7..6cd22a9c42 100644
--- a/scripts/nightly/pkg/bootiso-ub2lb-efika-ppc
+++ b/scripts/nightly/pkg/bootiso-ub2lb-efika-ppc
@@ -1,7 +1,8 @@
 #!/bin/zsh
 # Creates AROS/chrp-ppc-efika bootiso binary packages.
 
-BUILDTARGET=chrp-ppc
+BUILDCPU=ppc
+BUILDTARGET=chrp-$BUILDCPU
 VARIANT=efika
 BOOTLOADER=ub2lb
 
-- 
2.11.4.GIT