Use CROSS_COMPILE instead of LINUX_COMPILERarmlt-20150522gcc-path15.05

Use the "standard" CROSS_COMPILE prefix, with a sensible default,
rather than the LINUX_COMPILER variable.

If the user has the Linaro compiler on their path, it should "just
work".

Signed-off-by: Ryan Harkin <ryan.harkin@linaro.org>

5 files changed, 10 insertions, 14 deletions

diff --git a/build-arm-tf.sh b/build-arm-tf.sh
index 2ba6d96..749a75c 100755
--- a/build-arm-tf.sh
+++ b/build-arm-tf.sh
@@ -33,7 +33,7 @@
 #
 # VARIANT - build variant name
 # TOP_DIR - workspace root directory
-# LINUX_COMPILER - PATH to GCC including CROSS-COMPILE prefix
+# CROSS_COMPILE - PATH to GCC including CROSS-COMPILE prefix
 # ARM_TF_BUILD_ENABLED - Flag to enable building ARM Trusted Firmware
 # ARM_TF_PATH - sub-directory containing ARM Trusted Firmware code
 # ARM_TF_ARCH - ARM architecture (aarch64)
@@ -44,7 +44,6 @@
 do_build ()
 {
 	if [ "$ARM_TF_BUILD_ENABLED" == "1" ]; then
-		export CROSS_COMPILE=$TOP_DIR/$LINUX_COMPILER
 		export ARCH=$ARM_TF_ARCH
 
 		pushd $TOP_DIR/$ARM_TF_PATH
@@ -59,7 +58,6 @@ do_build ()
 do_clean ()
 {
 	if [ "$ARM_TF_BUILD_ENABLED" == "1" ]; then
-		export CROSS_COMPILE=$TOP_DIR/$LINUX_COMPILER
 		export ARCH=$ARM_TF_ARCH
 
 		pushd $TOP_DIR/$ARM_TF_PATH
diff --git a/build-linux.sh b/build-linux.sh
index 905d57d..c42226e 100755
--- a/build-linux.sh
+++ b/build-linux.sh
@@ -33,7 +33,7 @@
 #
 # VARIANT - build variant name
 # TOP_DIR - workspace root directory
-# LINUX_COMPILER - PATH to GCC including CROSS-COMPILE prefix
+# CROSS_COMPILE - PATH to GCC including CROSS-COMPILE prefix
 # PARALLELISM - number of cores to build across
 # LINUX_BUILD_ENABLED - Flag to enable building Linux
 # LINUX_PATH - sub-directory containing Linux code
@@ -44,7 +44,6 @@
 do_build ()
 {
 	if [ "$LINUX_BUILD_ENABLED" == "1" ]; then
-		export CROSS_COMPILE=$TOP_DIR/$LINUX_COMPILER
 		export ARCH=$LINUX_ARCH
 
 		pushd $TOP_DIR/$LINUX_PATH
@@ -67,7 +66,6 @@ do_build ()
 do_clean ()
 {
 	if [ "$LINUX_BUILD_ENABLED" == "1" ]; then
-		export CROSS_COMPILE=$TOP_DIR/$LINUX_COMPILER
 		export ARCH=$LINUX_ARCH
 
 		pushd $TOP_DIR/$LINUX_PATH
diff --git a/build-uboot.sh b/build-uboot.sh
index 1d23412..57f5654 100755
--- a/build-uboot.sh
+++ b/build-uboot.sh
@@ -33,7 +33,7 @@
 #
 # VARIANT - build variant name
 # TOP_DIR - workspace root directory
-# LINUX_COMPILER - PATH to GCC including CROSS-COMPILE prefix
+# CROSS_COMPILE - PATH to GCC including CROSS-COMPILE prefix
 # UBOOT_BUILD_ENABLED - Flag to enable building u-boot
 # UBOOT_PATH - sub-directory containing u-boot code
 # UBOOT_ARCH - Build architecture (aarch64)
@@ -45,7 +45,6 @@
 do_build ()
 {
 	if [ "$UBOOT_BUILD_ENABLED" == "1" ]; then
-		export CROSS_COMPILE=$TOP_DIR/$LINUX_COMPILER
 		export ARCH=$UBOOT_ARCH
 
 		pushd $TOP_DIR/$UBOOT_PATH
@@ -61,7 +60,6 @@ do_build ()
 do_clean ()
 {
 	if [ "$UBOOT_BUILD_ENABLED" == "1" ]; then
-		export CROSS_COMPILE=$TOP_DIR/$LINUX_COMPILER
 		export ARCH=$UBOOT_ARCH
 
 		pushd $TOP_DIR/$UBOOT_PATH
diff --git a/build-uefi.sh b/build-uefi.sh
index b251faa..a576833 100755
--- a/build-uefi.sh
+++ b/build-uefi.sh
@@ -33,7 +33,7 @@
 #
 # VARIANT - build variant name
 # TOP_DIR - workspace root directory
-# LINUX_COMPILER - PATH to GCC including CROSS-COMPILE prefix
+# CROSS_COMPILE - PATH to GCC including CROSS-COMPILE prefix
 # PARALLELISM - number of cores to build across
 # UEFI_BUILD_ENABLED - Flag to enable building UEFI
 # UEFI_PATH - sub-directory containing UEFI code
@@ -50,7 +50,7 @@ do_build ()
 		source ./edksetup.sh
 		make -C BaseTools
 		export EDK2_TOOLCHAIN=$UEFI_TOOLCHAIN
-		export ${UEFI_TOOLCHAIN}_AARCH64_PREFIX=$TOP_DIR/$LINUX_COMPILER
+		export ${UEFI_TOOLCHAIN}_AARCH64_PREFIX=$CROSS_COMPILE
 		export EDK2_MACROS="-n $PARALLELISM"
 		for item in $UEFI_PLATFORMS; do
 			make -f $item EDK2_BUILD=$UEFI_BUILD_MODE
@@ -67,7 +67,7 @@ do_clean ()
 		source ./edksetup.sh
 		make -C BaseTools clean
 		export EDK2_TOOLCHAIN=$UEFI_TOOLCHAIN
-		export ${UEFI_TOOLCHAIN}_AARCH64_PREFIX=$TOP_DIR/$LINUX_COMPILER
+		export ${UEFI_TOOLCHAIN}_AARCH64_PREFIX=$CROSS_COMPILE
 		export EDK2_MACROS="-n $PARALLELISM"
 		for item in $UEFI_PLATFORMS; do
 			make -f $item EDK2_BUILD=$UEFI_BUILD_MODE clean
diff --git a/variants/juno-oe b/variants/juno-oe
index fbdda7b..81f1d1c 100644
--- a/variants/juno-oe
+++ b/variants/juno-oe
@@ -28,8 +28,10 @@
 
 VARIANT_DESC="Juno LSK kernel for OpenEmbedded Software Stack"
 
-# Path to the aarch64 GCC compoiler binaries (plus prefix) relative to the workspace root
-LINUX_COMPILER=../tools/gcc/gcc-linaro-4.9-2014.11-x86_64_aarch64-linux-gnu/bin/aarch64-linux-gnu-
+# Absolute path to the aarch64 GCC compoiler binaries (plus prefix)
+# If you wish to specify a path relative to the workspace root, prefix it with "$TOP_DIR/"
+# If your compiler is on your path, you can simply add the prefix, as per the default example.
+export CROSS_COMPILE=${CROSS_COMPILE:-aarch64-linux-gnu-}
 BUILD_SCRIPTS=""
 
 LINUX_BUILD_ENABLED=1