Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/sys/conf Use 'a && b && ...' contructs for running multiple ...



details:   https://anonhg.NetBSD.org/src/rev/a0ae17aabb8c
branches:  trunk
changeset: 752760:a0ae17aabb8c
user:      njoly <njoly%NetBSD.org@localhost>
date:      Fri Mar 05 23:06:49 2010 +0000

description:
Use 'a && b && ...' contructs for running multiple commands on a single line
in Makefiles, to properly detect/report failures.

diffstat:

 sys/conf/Makefile.kern.inc |  20 ++++++++++----------
 1 files changed, 10 insertions(+), 10 deletions(-)

diffs (46 lines):

diff -r 4a6c587f9c53 -r a0ae17aabb8c sys/conf/Makefile.kern.inc
--- a/sys/conf/Makefile.kern.inc        Fri Mar 05 22:47:03 2010 +0000
+++ b/sys/conf/Makefile.kern.inc        Fri Mar 05 23:06:49 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile.kern.inc,v 1.126 2010/03/01 21:10:14 darran Exp $
+#      $NetBSD: Makefile.kern.inc,v 1.127 2010/03/05 23:06:49 njoly Exp $
 #
 # This file contains common `MI' targets and definitions and it is included
 # at the bottom of each `MD' ${MACHINE}/conf/Makefile.${MACHINE}.
@@ -123,7 +123,7 @@
 # Add CTF sections for DTrace
 .if defined(CTFCONVERT)
 COMPILE_CTFCONVERT=    ${_MKSHECHO}\
-                       ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}; \
+                       ${CTFCONVERT} ${CTFFLAGS} ${.TARGET} && \
                        ${CTFCONVERT} ${CTFFLAGS} ${.TARGET}
 .else
 COMPILE_CTFCONVERT=    ${_MKSHECHO}
@@ -131,19 +131,19 @@
 
 # compile rules: rules are named ${TYPE}_${SUFFIX} where TYPE is NORMAL or
 # NOPROF and SUFFIX is the file suffix, capitalized (e.g. C for a .c file).
-NORMAL_C?=     @${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}"; \
+NORMAL_C?=     @${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}" && \
                ${_MKSHECHO}\
-               ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<; \
-               ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $<; \
+               ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< && \
+               ${CC} ${CFLAGS} ${CPPFLAGS} ${PROF} -c $< && \
                ${COMPILE_CTFCONVERT}
-NOPROF_C?=     @${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}"; \
+NOPROF_C?=     @${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}" && \
                ${_MKSHECHO}\
-               ${CC} ${CFLAGS} ${CPPFLAGS} -c $<; \
-               ${CC} ${CFLAGS} ${CPPFLAGS} -c $<; \
+               ${CC} ${CFLAGS} ${CPPFLAGS} -c $< && \
+               ${CC} ${CFLAGS} ${CPPFLAGS} -c $< && \
                ${COMPILE_CTFCONVERT}
-NORMAL_S?=     @${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}"; \
+NORMAL_S?=     @${_MKSHMSG} "compile  ${.CURDIR:T}/${.TARGET}" && \
                ${_MKSHECHO}\
-               ${CC} ${AFLAGS} ${CPPFLAGS} -c $<; \
+               ${CC} ${AFLAGS} ${CPPFLAGS} -c $< && \
                ${CC} ${AFLAGS} ${CPPFLAGS} -c $<
 
 ##



Home | Main Index | Thread Index | Old Index