Author: avg
Date: Tue Nov 12 10:22:48 2019
New Revision: 354636
URL: https://svnweb.freebsd.org/changeset/base/354636
Log:
allow NO_CLEAN builds to work after opensolaris_atomic.S removal in r354634
This is a direct commit modelled after r353408 in head.
Modified:
stable/12/Makefile.inc1
Modified: stable/12/Makefile.inc1
==============================================================================
--- stable/12/Makefile.inc1 Tue Nov 12 10:02:39 2019 (r354635)
+++ stable/12/Makefile.inc1 Tue Nov 12 10:22:48 2019 (r354636)
@@ -902,7 +902,7 @@ _sanity_check: .PHONY .MAKE
# replacing generated files. Handle these cases here in an ad-hoc fashion.
_cleanobj_fast_depend_hack: .PHONY
# Syscall stubs rewritten in C and obsolete MD assembly implementations
-# Date SVN Rev Syscalls
+# Date SVN Rev Syscalls/Changes
# 20170624 r320278 fstat fstatat fstatfs getdirentries getfsstat statfs
# 20180404 r332048 sigreturn
# 20180405 r332080 shmat
@@ -970,6 +970,17 @@ _cleanobj_fast_depend_hack: .PHONY
echo "Removing stale wpa dependencies"; \
rm -f ${OBJTOP}/usr.sbin/wpa/*/.depend*; \
fi
+# 20191112 r354634 removal of opensolaris_atomic.S
+.if ${MACHINE} != i386
+.for f in opensolaris_atomic
+ @if [ -e "${OBJTOP}/cddl/lib/libzpool/.depend.${f}.o" ] && \
+ egrep -qw 'opensolaris_atomic\.S'
${OBJTOP}/cddl/lib/libzpool/.depend.${f}.o; then \
+ echo "Removing stale dependencies for opensolaris_atomic"; \
+ rm -f ${OBJTOP}/cddl/lib/libzpool/.depend.${f}.* \
+
${LIBCOMPAT:D${LIBCOMPAT_OBJTOP}/cddl/lib/libzpool/.depend.${f}.*}; \
+ fi
+.endfor
+.endif
_worldtmp: .PHONY
@echo
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
