From f7d365b72fb2ed988af2f8a60c1fa04d7db37a17 Mon Sep 17 00:00:00 2001
From: Charles Baylis <charles.baylis@linaro.org>
Date: Thu, 28 Apr 2016 12:32:11 +0100
Subject: Remove -i and -k flags from make invocations

Abe should not use the -i (--ignore-errors) option for make. This causes
errors which occur during building to be undetected.

This patch also removes -k (--keep-going) as it makes it harder to diagnose
errors from build logs.

Since "make check" is expected to have some failures, we don't want to abort
those when failures occur, so "-i -k" is retained for make check.

Change-Id: Ie23640c752968f052adfdcc92a80bba0e35c8619
---
 lib/make.sh | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/lib/make.sh b/lib/make.sh
index dbd3ef24..2cd27a2c 100755
--- a/lib/make.sh
+++ b/lib/make.sh
@@ -610,15 +610,15 @@ make_install()
     fi
 
     local default_makeflags= #"`get_component_makeflags ${component}`"
+    local install_log="`dirname ${builddir}`/install.log"
     if test x"${component}" = x"gdb" ; then
-	local log="`dirname ${builddir}`/install.log"
 	if test x"$2" != x"gdbserver" ; then
-            dryrun "make install-gdb ${make_flags} ${default_makeflags} -i -k -w -C ${builddir} 2>&1 | tee ${log}"
+            dryrun "make install-gdb ${make_flags} ${default_makeflags} -w -C ${builddir} 2>&1 | tee ${install_log}"
         else
-            dryrun "make install ${make_flags} -i -k -w -C ${builddir} 2>&1 | tee ${log}"
+            dryrun "make install ${make_flags} -w -C ${builddir} 2>&1 | tee ${install_log}"
         fi
     else
-	dryrun "make install ${make_flags} ${default_makeflags} -i -k -w -C ${builddir} 2>&1 | tee ${log}"
+	dryrun "make install ${make_flags} ${default_makeflags} -w -C ${builddir} 2>&1 | tee ${install_log}"
     fi
     if test $? != "0"; then
         warning "Make install failed!"
@@ -791,9 +791,9 @@ make_clean()
     notice "Making clean in ${builddir}"
 
     if test x"$2" = "dist"; then
-        dryrun "make distclean ${make_flags} -w -i -k -C ${builddir}"
+        dryrun "make distclean ${make_flags} -w -C ${builddir}"
     else
-        dryrun "make clean ${make_flags} -w -i -k -C ${builddir}"
+        dryrun "make clean ${make_flags} -w -C ${builddir}"
     fi
     if test $? != "0"; then
         warning "Make clean failed!"
@@ -827,12 +827,12 @@ make_docs()
             return 0
             ;;
         *gdb)
-            dryrun "make SHELL=${bash_shell} ${make_flags} -i -k -w -C ${builddir}/gdb diststuff install-html install-info 2>&1 | tee -a ${builddir}/makedoc.log"
+            dryrun "make SHELL=${bash_shell} ${make_flags} -w -C ${builddir}/gdb diststuff install-html install-info 2>&1 | tee -a ${builddir}/makedoc.log"
             return $?
             ;;
         *gcc*)
             #dryrun "make SHELL=${bash_shell} ${make_flags} -w -C ${builddir} doc html info man 2>&1 | tee -a ${builddir}/makedoc.log"
-            dryrun "make SHELL=${bash_shell} ${make_flags} -i -k -w -C ${builddir} install-html install-info 2>&1 | tee -a ${builddir}/makedoc.log"
+            dryrun "make SHELL=${bash_shell} ${make_flags} -w -C ${builddir} install-html install-info 2>&1 | tee -a ${builddir}/makedoc.log"
             return $?
             ;;
         *linux*|*dejagnu*|*gmp*|*mpc*|*mpfr*|*newlib*|*make*)
-- 
cgit v1.2.3