svn commit: r291338 - head/share/mk

Bryan Drewery bdrewery at FreeBSD.org
Wed Nov 25 22:32:17 UTC 2015


Author: bdrewery
Date: Wed Nov 25 22:32:16 2015
New Revision: 291338
URL: https://svnweb.freebsd.org/changeset/base/291338

Log:
  Fix the "common object" handling to not depend on ".o" if SRCS only contains
  headers.
  
  This resulted in 'don't know how to make .o.' errors after the changes in
  r289286.
  
  MFC after:	2 weeks
  Sponsored by:	EMC / Isilon Storage Division

Modified:
  head/share/mk/bsd.progs.mk

Modified: head/share/mk/bsd.progs.mk
==============================================================================
--- head/share/mk/bsd.progs.mk	Wed Nov 25 22:07:18 2015	(r291337)
+++ head/share/mk/bsd.progs.mk	Wed Nov 25 22:32:16 2015	(r291338)
@@ -102,7 +102,10 @@ _PROGS_ALL_SRCS+=	${s}
 .endfor
 .endfor
 .if !empty(_PROGS_COMMON_SRCS)
-_PROGS_COMMON_OBJS=	${_PROGS_COMMON_SRCS:N*.h:R:S/$/.o/g}
+_PROGS_COMMON_OBJS=	${_PROGS_COMMON_SRCS:M*.h}
+.if !empty(_PROGS_COMMON_SRCS:N*.h)
+_PROGS_COMMON_OBJS+=	${_PROGS_COMMON_SRCS:N*.h:R:S/$/.o/g}
+.endif
 ${PROGS}: ${_PROGS_COMMON_OBJS}
 .endif
 


More information about the svn-src-all mailing list