diff options
| author | Leif Lindholm <leif.lindholm@linaro.org> | 2017-06-22 14:57:39 +0100 |
|---|---|---|
| committer | Leif Lindholm <leif.lindholm@linaro.org> | 2017-06-22 14:57:39 +0100 |
| commit | c1d242150ec211bda8fb00a52af53730717b63bd (patch) | |
| tree | c1577e6fd0e1e62936c5f3ce20fd76499ce0f083 | |
| parent | d3df52fa60dc1b77ebc5732f1bf2dd28a0d2c705 (diff) | |
uefi-build.sh: fix CROSS_COMPILE_32/64
Some trigger happiness in common-functions when creating
edk2-build.sh broke handling of CROSS_COMPILE_32 and
CROSS_COMPILE_64. Fix that.
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
| -rw-r--r-- | common-functions | 3 | ||||
| -rwxr-xr-x | uefi-build.sh | 21 |
2 files changed, 21 insertions, 3 deletions
diff --git a/common-functions b/common-functions index 0f882f5..80b690e 100644 --- a/common-functions +++ b/common-functions @@ -77,6 +77,7 @@ function set_cross_compile function get_gcc_version { + $1 -v >/dev/null 2>&1 || return 1 gcc_version=$($1 -dumpversion) MAJVER=`echo $gcc_version | cut -d. -f1` @@ -96,6 +97,8 @@ function get_gcc_version fi ;; esac + + return 0 } function get_clang_version diff --git a/uefi-build.sh b/uefi-build.sh index db2cb4f..ce5d727 100755 --- a/uefi-build.sh +++ b/uefi-build.sh @@ -78,7 +78,14 @@ function do_build import_openssl fi - set_cross_compile + if [ -n "$CROSS_COMPILE_64" -a "$PLATFORM_ARCH" == "AARCH64" ]; then + TEMP_CROSS_COMPILE="$CROSS_COMPILE_64" + elif [ -n "$CROSS_COMPILE_32" -a "$PLATFORM_ARCH" == "ARM" ]; then + TEMP_CROSS_COMPILE="$CROSS_COMPILE_32" + else + set_cross_compile + fi + CROSS_COMPILE="$TEMP_CROSS_COMPILE" echo "Building $PLATFORM_NAME - $PLATFORM_ARCH" @@ -91,12 +98,20 @@ function do_build case $TOOLCHAIN in "gcc") - export TOOLCHAIN=`get_gcc_version "$CROSS_COMPILE"gcc` + TOOLCHAIN=`get_gcc_version "$CROSS_COMPILE"gcc` + if [ $? -ne 0 ]; then + echo "${CROSS_COMPILE}gcc not found!" >&2 + return 1 + fi ;; "clang") - export TOOLCHAIN=`get_clang_version clang` + TOOLCHAIN=`get_clang_version clang` + if [ $? -ne 0 ]; then + return 1 + fi ;; esac + export TOOLCHAIN echo "TOOLCHAIN is ${TOOLCHAIN}" export ${TOOLCHAIN}_${PLATFORM_ARCH}_PREFIX=$CROSS_COMPILE |