Author: emaste
Date: Mon Oct 21 18:40:03 2019
New Revision: 353871
URL: https://svnweb.freebsd.org/changeset/base/353871
Log:
Additional fix for -DNO_CLEAN build across r353340 and r353381
opensolaris_atomic.S is now only used on i386 with opensolaris_atomic.c
used on other platforms. After r353381 it doesn't exist on those
platforms so the stale dependency would result in a build error.
r353408 addressed this issue for cddl/lib/libzpool, but it persisted
with the opensolaris and zfs modules.
Modified:
head/Makefile.inc1
Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1 Mon Oct 21 18:27:12 2019 (r353870)
+++ head/Makefile.inc1 Mon Oct 21 18:40:03 2019 (r353871)
@@ -1620,6 +1620,18 @@ _cleankernobj_fast_depend_hack: .PHONY
rm -f ${OBJTOP}/sys/${KERNCONF}/assym.* \
${OBJTOP}/sys/${KERNCONF}/.depend.assym.*; \
fi
+# 20191009 r353340 removal of opensolaris_atomic.S (also r353381)
+.if ${MACHINE} != i386
+.for f in opensolaris_atomic
+.for m in opensolaris zfs
+ @if [ -e
"${KRNLOBJDIR}/${KERNCONF}/modules${SRCTOP}/sys/modules/${m}/.depend.${f}.o" ]
&& \
+ grep -q ${f}.S
"${KRNLOBJDIR}/${KERNCONF}/modules${SRCTOP}/sys/modules/${m}/.depend.${f}.o";
then \
+ echo "Removing stale dependencies for opensolaris_atomic"; \
+ rm -f
${KRNLOBJDIR}/${KERNCONF}/modules${SRCTOP}/sys/modules/${m}/.depend.${f}.*; \
+ fi
+.endfor
+.endfor
+.endif
${WMAKE_TGTS:N_worldtmp:Nbuild${libcompat}} ${.ALLTARGETS:M_*:N_worldtmp}:
.MAKE .PHONY
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
