Changes to make incremental builds a little faster

utility scripts to build portions of the toolchain seperately.

Author: stevenj

build-avrlibc3.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Build Binutils ONLY
+export BUILD_LINUX=1
+export BUILD_WIN32=1
+export BUILD_WIN64=1
+
+export BUILD_BINUTILS=0
+export BUILD_GCC=0
+export BUILD_LIBC=1
+
+./build.sh

build-binutils.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Build Binutils ONLY
+export BUILD_LINUX=1
+export BUILD_WIN32=1
+export BUILD_WIN64=1
+
+export BUILD_BINUTILS=1
+export BUILD_GCC=0
+export BUILD_LIBC=0
+
+./build.sh

build-gcc.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+# Build Binutils ONLY
+export BUILD_LINUX=1
+export BUILD_WIN32=1
+export BUILD_WIN64=1
+
+export BUILD_BINUTILS=0
+export BUILD_GCC=1
+export BUILD_LIBC=0
+
+./build.sh

build.sh

@@ -3,66 +3,86 @@
 # http://www.nongnu.org/avr-libc/user-manual/install_tools.html
 
 # For optimum compile time this should generally be set to the number of CPU cores your machine has
-JOBCOUNT=8
+# Do it automatically, can over-ride from command line.
+if [ -z ${JOBCOUNT+x} ]; then
+	CORES=$(getconf _NPROCESSORS_ONLN)
+	JOBCOUNT=$CORES
+fi
 
 # Build Linux toolchain
 # A Linux AVR-GCC toolchain is required to build a Windows toolchain
 # If the Linux toolchain has already been built then you can set this to 0
-BUILD_LINUX=1
+if [ -z ${BUILD_LINUX+x} ]; then
+	BUILD_LINUX=1
+fi
 
 # Build 32 bit Windows toolchain
-BUILD_WIN32=0
+if [ -z ${BUILD_WIN32+x} ]; then
+	BUILD_WIN32=1
+fi
 
 # Build 64 bit Windows toolchain
-BUILD_WIN64=0
+if [ -z ${BUILD_WIN64+x} ]; then
+	BUILD_WIN64=1
+fi
 
 # Build Binutils?  Can be set on command line.
-if [ -z ${BUILD_BINUTILS+x} ]; then 
-	BUILD_BINUTILS=0 
+if [ -z ${BUILD_BINUTILS+x} ]; then
+	BUILD_BINUTILS=1
 fi
 
 # Build AVR-GCC?  Can be set on command line.
-if [ -z ${BUILD_GCC+x} ]; then 
-	BUILD_GCC=0 
+if [ -z ${BUILD_GCC+x} ]; then
+	BUILD_GCC=1
 fi
 
 # Build AVR-LibC?  Can be set on command line.
-if [ -z ${BUILD_LIBC+x} ]; then 
-	BUILD_LIBC=1 
+if [ -z ${BUILD_LIBC+x} ]; then
+	BUILD_LIBC=1
 fi
 
 # Output locations for built toolchains
-PREFIX_LINUX=/opt/AVR/linux
-PREFIX_WIN32=/omgwtfbbq/win32
-PREFIX_WIN64=/omgwtfbbq/win64
-PREFIX_LIBC=/opt/AVR/libc
+if [ -z ${PREFIX+x} ]; then
+	PREFIX=/opt/AVR
+fi
+
+PREFIX_LINUX="$PREFIX"/avr-gcc-linux
+PREFIX_WIN32="$PREFIX"/avr-gcc-win32
+PREFIX_WIN64="$PREFIX"/avr-gcc-win64
+PREFIX_LIBC="$PREFIX"/avr-libc3
 
 # Install packages
-if hash apt-get 2>/dev/null; then
-	# This works for Debian 8 and Ubuntu 16.04
-	apt-get install wget make gcc g++ bzip2
-elif hash yum 2>/dev/null; then
-	# This works for CentOS 7
-	yum install wget
-	rpm -q epel-release-7-6.noarch >/dev/null
-	if [ $? -ne 0 ]; then
-		# EPEL is for the MinGW stuff
-		rm -f epel-release-7-6.noarch.rpm
-		wget https://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/epel//7/x86_64/e/epel-release-7-6.noarch.rpm
-		rpm -Uvh epel-release-7-6.noarch.rpm
+if [ "$EUID" -eq 0 ]; then
+	echo "Running as root, so trying to install dependant packages."
+	if hash apt-get 2>/dev/null; then
+		# This works for Debian 8 and Ubuntu 16.04
+		apt-get install wget make gcc g++ bzip2 mingw-w64
+	elif hash yum 2>/dev/null; then
+		# This works for CentOS 7
+		yum install wget
+		rpm -q epel-release-7-6.noarch >/dev/null
+		if [ $? -ne 0 ]; then
+			# EPEL is for the MinGW stuff
+			rm -f epel-release-7-6.noarch.rpm
+			wget https://www.mirrorservice.org/sites/dl.fedoraproject.org/pub/epel//7/x86_64/e/epel-release-7-6.noarch.rpm
+			rpm -Uvh epel-release-7-6.noarch.rpm
+		fi
+		yum install make mingw64-gcc mingw64-gcc-c++ mingw32-gcc mingw32-gcc-c++ gcc gcc-c++ bzip2
+	elif hash pacman 2>/dev/null; then
+		# This works for Arch
+		pacman -S --needed wget make mingw-w64-binutils mingw-w64-gcc mingw-w64-crt mingw-w64-headers mingw-w64-winpthreads gcc bzip2
 	fi
-	yum install make mingw64-gcc mingw64-gcc-c++ mingw32-gcc mingw32-gcc-c++ gcc gcc-c++ bzip2
-elif hash pacman 2>/dev/null; then
-	# This works for Arch
-	pacman -S --needed wget make mingw-w64-binutils mingw-w64-gcc mingw-w64-crt mingw-w64-headers mingw-w64-winpthreads gcc bzip2
+
+	echo "We will not build while running as root, run as standard user to build."
+	exit 1
 fi
 
 # Stop on errors
 set -e
 
 NAME_BINUTILS="binutils-2.32"
 NAME_GCC="gcc-9.1.0"
-NAME_LIBC="avr-libc.git"
+NAME_LIBC="avr-libc3.git"
 
 HOST_WIN32="i686-w64-mingw32"
 HOST_WIN64="x86_64-w64-mingw32"
@@ -95,18 +115,23 @@ makeDir()
 }
 
 echo "Clearing output directories..."
-[ $BUILD_LINUX -eq 1 ] && makeDir "$PREFIX_LINUX"
-[ $BUILD_WIN32 -eq 1 ] && makeDir "$PREFIX_WIN32"
-[ $BUILD_WIN64 -eq 1 ] && makeDir "$PREFIX_WIN64"
+[ $BUILD_LINUX -eq 1 ] && [ $BUILD_BINUTILS -eq 1 ] && makeDir "$PREFIX_LINUX"
+[ $BUILD_WIN32 -eq 1 ] && [ $BUILD_BINUTILS -eq 1 ] && makeDir "$PREFIX_WIN32"
+[ $BUILD_WIN64 -eq 1 ] && [ $BUILD_BINUTILS -eq 1 ] && makeDir "$PREFIX_WIN64"
 [ $BUILD_LIBC -eq 1 ] && makeDir "$PREFIX_LIBC"
 
-PATH="$PATH":"$PREFIX_LINUX"/bin
+PATH="$PREFIX_LINUX"/bin:"$PATH"
 export PATH
 
 CC=""
 export CC
 
 echo "Downloading sources..."
+
+# Create a temp directory for downloading and building in, to not polute base directory
+makeDir buildtemp
+cd buildtemp
+
 if [ $BUILD_BINUTILS -eq 1 ]; then
 	rm -f $NAME_BINUTILS.tar.xz
 	rm -rf $NAME_BINUTILS/
@@ -121,7 +146,7 @@ fi
 
 if [ $BUILD_LIBC -eq 1 ]; then
 	rm -rf $NAME_LIBC/
-	if [ "$NAME_LIBC" = "avr-libc.git" ]; then
+	if [ "$NAME_LIBC" = "avr-libc3.git" ]; then
 		git clone https://github.com/stevenj/avr-libc3.git "$NAME_LIBC"
 		echo "Preparing"
 		cd $NAME_LIBC
@@ -148,11 +173,20 @@ if [ $BUILD_BINUTILS -eq 1 ]; then
 	tar xf $NAME_BINUTILS.tar.xz
 	mkdir -p $NAME_BINUTILS/obj-avr
 	cd $NAME_BINUTILS/obj-avr
-	[ $BUILD_LINUX -eq 1 ] && confMake "$PREFIX_LINUX" "$OPTS_BINUTILS"
-	[ $BUILD_WIN32 -eq 1 ] && confMake "$PREFIX_WIN32" "$OPTS_BINUTILS" --host=$HOST_WIN32 --build=`../config.guess`
-	[ $BUILD_WIN64 -eq 1 ] && confMake "$PREFIX_WIN64" "$OPTS_BINUTILS" --host=$HOST_WIN64 --build=`../config.guess`
+	if [ $BUILD_LINUX -eq 1 ]; then
+		echo "********** BUILDING LINUX BINUTILS *************"
+		confMake "$PREFIX_LINUX" "$OPTS_BINUTILS"
+	fi
+	if [ $BUILD_WIN32 -eq 1 ]; then
+		echo "********** BUILDING WIN32 BINUTILS *************"
+		confMake "$PREFIX_WIN32" "$OPTS_BINUTILS" --host=$HOST_WIN32 --build=`../config.guess`
+	fi
+	if [ $BUILD_WIN64 -eq 1 ]; then
+		echo "********** BUILDING WIN64 BINUTILS *************"
+		confMake "$PREFIX_WIN64" "$OPTS_BINUTILS" --host=$HOST_WIN64 --build=`../config.guess`
+	fi
 	cd ../../
-fi	
+fi
 
 # Make AVR-GCC
 if [ $BUILD_GCC -eq 1 ]; then
@@ -168,12 +202,12 @@ if [ $BUILD_GCC -eq 1 ]; then
 	[ $BUILD_WIN32 -eq 1 ] && confMake "$PREFIX_WIN32" "$OPTS_GCC" --host=$HOST_WIN32 --build=`../config.guess`
 	[ $BUILD_WIN64 -eq 1 ] && confMake "$PREFIX_WIN64" "$OPTS_GCC" --host=$HOST_WIN64 --build=`../config.guess`
 	cd ../../
-fi	
+fi
 
 # Make AVR-LibC
 if [ $BUILD_LIBC -eq 1 ]; then
 	echo "Making AVR-LibC..."
-	if [ "$NAME_LIBC" != "avr-libc.git" ]; then
+	if [ "$NAME_LIBC" != "avr-libc3.git" ]; then
 		echo "Extracting..."
 		bunzip2 -c $NAME_LIBC.tar.bz2 | tar xf -
 	fi
@@ -190,4 +224,3 @@ echo ""
 echo "Done in $TIME_RUN seconds"
 
 exit 0
-