diff options
| author | Martin Roth <martinroth@google.com> | 2016-01-07 11:03:36 -0700 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2016-01-09 22:18:59 +0100 |
| commit | 8846382cbbbf301e313958aadc4bed2522796c1f (patch) | |
| tree | 55197270981e2351f57b5e5be83dd3f4cf943297 /util/crossgcc | |
| parent | fecc24af049bfec00efce49858e228dd9ab2d11c (diff) | |
buildgcc: Print out all missing tools then halt
Instead of printing out a single tool that needs to be installed
each time buildgcc is run, print out the entire list of tools
to be installed, then halt.
Change-Id: I7761760eef3c45ba371f882a4f987408945bb3e5
Signed-off-by: Martin Roth <martinroth@google.com>
Reviewed-on: https://review.coreboot.org/12856
Tested-by: build bot (Jenkins)
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
Diffstat (limited to 'util/crossgcc')
| -rwxr-xr-x | util/crossgcc/buildgcc | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/util/crossgcc/buildgcc b/util/crossgcc/buildgcc index 8e97439d84..c665412072 100755 --- a/util/crossgcc/buildgcc +++ b/util/crossgcc/buildgcc @@ -92,6 +92,7 @@ CYAN='\033[1;36m' NC='\033[0m' # No Color UNAME=$(uname | grep -iq cygwin && echo Cygwin || uname) +HALT_FOR_TOOLS=0 normalize_dirs() { @@ -106,6 +107,7 @@ normalize_dirs() please_install() { + HALT_FOR_TOOLS=1 test -r /etc/os-release && . /etc/os-release case "$ID_LIKE" in debian) solution="sudo apt-get install $1" ;; @@ -171,7 +173,7 @@ searchtool() fi fi - [ -z "$3" ] && please_install $1 $4 && exit 1 + [ -z "$3" ] && please_install $1 $4 false } @@ -651,6 +653,10 @@ searchtool clang "LLVM" "" "g++" > /dev/null searchtool wget > /dev/null searchtool bzip2 "bzip2," > /dev/null +if [ "$HALT_FOR_TOOLS" -ne 0 ]; then + exit 1 +fi + # This initial cleanup is useful when updating the toolchain script. if [ "$clean" = "1" ]; then |