diff options
author | obrien <obrien@FreeBSD.org> | 2012-09-12 14:44:25 +0000 |
---|---|---|
committer | obrien <obrien@FreeBSD.org> | 2012-09-12 14:44:25 +0000 |
commit | 2cda43d113be125dcf736ac2fe7e8f8ee2beee13 (patch) | |
tree | 2462e214722a0f83d904824640d6b0258401d886 | |
parent | 2b81e41ea80fc64dafcfe5d6e451547738ec938c (diff) | |
download | FreeBSD-src-2cda43d113be125dcf736ac2fe7e8f8ee2beee13.zip FreeBSD-src-2cda43d113be125dcf736ac2fe7e8f8ee2beee13.tar.gz |
Not all Pmake derivatives silently handle empty shell output, so ensure there
is something for make(1) to consume. Bmake gives output such as:
"warning: Couldn't read shell's output for "/bin/sh -c true"
Note we parted from traditional Pmake behavior in r18864 / r18255.
-rw-r--r-- | Makefile | 2 | ||||
-rw-r--r-- | Makefile.inc1 | 2 |
2 files changed, 2 insertions, 2 deletions
@@ -216,7 +216,7 @@ ${TGTS}: .MAIN: all STARTTIME!= LC_ALL=C date -CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s +CHECK_TIME!= find ${.CURDIR}/sys/sys/param.h -mtime -0s ; echo .if !empty(CHECK_TIME) .error check your date/time: ${STARTTIME} .endif diff --git a/Makefile.inc1 b/Makefile.inc1 index 755418d..1ea269b 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -1558,7 +1558,7 @@ DTBOUTPUTPATH= ${KRNLOBJDIR}/${KERNCONF}/ .if !defined(FDT_DTS_FILE) || empty(FDT_DTS_FILE) .if exists(${KERNCONFDIR}/${KERNCONF}) FDT_DTS_FILE!= awk 'BEGIN {FS="="} /^makeoptions[[:space:]]+FDT_DTS_FILE/ {print $$2}' \ - ${KERNCONFDIR}/${KERNCONF} + ${KERNCONFDIR}/${KERNCONF} ; echo .endif .endif |