svn commit: r238992 - in stable/9/sys/boot: ficl zfs

Andrey A. Chernov ache at FreeBSD.org
Thu Aug 2 15:13:13 UTC 2012


Author: ache
Date: Thu Aug  2 15:13:12 2012
New Revision: 238992
URL: http://svn.freebsd.org/changeset/base/238992

Log:
  MFC r238795
  
  Try to avoid all files dependence on the modification time of the large
  and often modified directory created symbolic links points to - it cause
  unnecessary full rebuilds each time make runs when directory is changed.
  So do it only if symbolic link does not exists, which usually means that
  objdir is clean anyway.
  
  Approved by:    re (kib)

Modified:
  stable/9/sys/boot/ficl/Makefile
  stable/9/sys/boot/zfs/Makefile
Directory Properties:
  stable/9/sys/boot/   (props changed)

Modified: stable/9/sys/boot/ficl/Makefile
==============================================================================
--- stable/9/sys/boot/ficl/Makefile	Thu Aug  2 15:05:34 2012	(r238991)
+++ stable/9/sys/boot/ficl/Makefile	Thu Aug  2 15:13:12 2012	(r238992)
@@ -54,9 +54,11 @@ softcore.c: ${SOFTWORDS} softcore.awk
 	    | awk -f softcore.awk -v datestamp="`LC_ALL=C date`") > ${.TARGET}
 
 .if ${MACHINE_CPUARCH} == "amd64"
+.if !exists(machine)
 ${SRCS:M*.c:R:S/$/.o/g}: machine
 
 beforedepend ${OBJS}: machine
+.endif
 
 machine:
 	ln -sf ${.CURDIR}/../../i386/include machine

Modified: stable/9/sys/boot/zfs/Makefile
==============================================================================
--- stable/9/sys/boot/zfs/Makefile	Thu Aug  2 15:05:34 2012	(r238991)
+++ stable/9/sys/boot/zfs/Makefile	Thu Aug  2 15:13:12 2012	(r238992)
@@ -33,5 +33,7 @@ machine:
 .include <bsd.lib.mk>
 
 .if ${MACHINE_CPUARCH} == "amd64"
+.if !exists(machine)
 beforedepend ${OBJS}: machine
 .endif
+.endif


More information about the svn-src-stable mailing list