svn commit: r354698 - stable/12

[Brooks Davis]

Author: brooks
Date: Wed Nov 13 23:26:12 2019
New Revision: 354698
URL: https://svnweb.freebsd.org/changeset/base/354698

Log:
  MFC r353871
  Record prior MFC of r353408
  
  r353408:
  Fix -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.
  
  r353871:
  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:
  stable/12/Makefile.inc1
Directory Properties:
  stable/12/   (props changed)

Modified: stable/12/Makefile.inc1
==============================================================================
--- stable/12/Makefile.inc1	Wed Nov 13 22:43:11 2019	(r354697)
+++ stable/12/Makefile.inc1	Wed Nov 13 23:26:12 2019	(r354698)
@@ -1564,6 +1564,18 @@ _cleankernobj_fast_depend_hack: .PHONY
 		rm -f ${OBJTOP}/sys/${KERNCONF}/assym.* \
 		    ${OBJTOP}/sys/${KERNCONF}/.depend.assym.*; \
 	fi
+# 20191112  r354634  removal of opensolaris_atomic.S
+.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