diff options
| author | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-16 22:38:23 +0200 |
|---|---|---|
| committer | Stefan Reinauer <stefan.reinauer@coreboot.org> | 2015-06-17 03:11:19 +0200 |
| commit | 66e93355d1b91ace4a1acdf883606e7af96069d0 (patch) | |
| tree | 7b9b9fb08f8592a05cf2712b8f3d825f96af8520 | |
| parent | 93a9630be388e642abad00e4a90f508bf7446741 (diff) | |
buildgcc: Check for dependencies after printing banner
For consistency in user output, move the check for all
required utilities after printing the banner and parsing
options.
Change-Id: I5bf31368885c73e35f18b02d53d099f3f3871acc
Signed-off-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Reviewed-on: http://review.coreboot.org/10566
Tested-by: build bot (Jenkins)
Reviewed-by: Patrick Georgi <pgeorgi@google.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
| -rwxr-xr-x | util/crossgcc/buildgcc | 32 |
1 files changed, 17 insertions, 15 deletions
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 0c6193d517..c27d62cd7f 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -174,21 +174,6 @@ searchtool() false } -TAR=$(searchtool tar) || exit $? -PATCH=$(searchtool patch) || exit $? -MAKE=$(searchtool make) || exit $? -SHA1SUM=$(searchtool sha1sum) -SHA512SUM=$(searchtool sha512sum) -CHECKSUM=$SHA1SUM - -searchtool m4 > /dev/null -searchtool bison > /dev/null -searchtool flex flex > /dev/null -searchtool g++ "Free Software Foundation" nofail > /dev/null || \ -searchtool clang "clang version" > /dev/null -searchtool wget > /dev/null -searchtool bzip2 "bzip2," > /dev/null - download() { package=$1 archive="$(eval echo \$$package"_ARCHIVE")" @@ -577,6 +562,23 @@ case "$PACKAGE" in ;; esac +# Find all the required tools: + +TAR=$(searchtool tar) || exit $? +PATCH=$(searchtool patch) || exit $? +MAKE=$(searchtool make) || exit $? +SHA1SUM=$(searchtool sha1sum) +SHA512SUM=$(searchtool sha512sum) +CHECKSUM=$SHA1SUM + +searchtool m4 > /dev/null +searchtool bison > /dev/null +searchtool flex flex > /dev/null +searchtool g++ "Free Software Foundation" nofail > /dev/null || \ +searchtool clang "clang version" > /dev/null +searchtool wget > /dev/null +searchtool bzip2 "bzip2," > /dev/null + # This initial cleanup is useful when updating the toolchain script. if [ "$clean" = "1" ]; then |