svn commit: r251653 - stable/9

Glen Barber gjb at FreeBSD.org
Wed Jun 12 13:17:44 UTC 2013


Author: gjb
Date: Wed Jun 12 13:17:43 2013
New Revision: 251653
URL: http://svnweb.freebsd.org/changeset/base/251653

Log:
  MFC r240403 (obrien):
    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"
  
  Approved by:	kib (mentor)

Modified:
  stable/9/Makefile   (contents, props changed)
  stable/9/Makefile.inc1   (contents, props changed)

Modified: stable/9/Makefile
==============================================================================
--- stable/9/Makefile	Wed Jun 12 13:15:28 2013	(r251652)
+++ stable/9/Makefile	Wed Jun 12 13:17:43 2013	(r251653)
@@ -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

Modified: stable/9/Makefile.inc1
==============================================================================
--- stable/9/Makefile.inc1	Wed Jun 12 13:15:28 2013	(r251652)
+++ stable/9/Makefile.inc1	Wed Jun 12 13:17:43 2013	(r251653)
@@ -1658,7 +1658,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
 


More information about the svn-src-stable mailing list