diff options
| author | Charles Baylis <charles.baylis@linaro.org> | 2016-04-28 12:32:11 +0100 |
|---|---|---|
| committer | Charles Baylis <charles.baylis@linaro.org> | 2016-05-17 12:37:54 +0000 |
| commit | f7d365b72fb2ed988af2f8a60c1fa04d7db37a17 (patch) | |
| tree | c48f78c414d43cfb12772ebce1979ab75b8ae0e6 | |
| parent | c01c9ce85cec84a5eb1e14cec196ab0ac4a5b3ac (diff) | |
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
| -rwxr-xr-x | lib/make.sh | 16 |
1 files 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*) |