svn commit: r325072 - head

[Bryan Drewery]

Author: bdrewery
Date: Sun Oct 29 01:20:56 2017
New Revision: 325072
URL: https://svnweb.freebsd.org/changeset/base/325072

Log:
  FAST_DEPEND clean hack: Remove lib32/soft files properly.
  
  Only remove them if the option is enabled and also handle libsoft
  by using the proper LIBCOMPAT_OBJTREE.  LIBCOMPAT:D will expand
  the text after it as a proper glob to the command line if LIBCOMPAT
  is defined.
  
  Sponsored by:	Dell EMC Isilon

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1	Sun Oct 29 01:20:53 2017	(r325071)
+++ head/Makefile.inc1	Sun Oct 29 01:20:56 2017	(r325072)
@@ -782,7 +782,7 @@ _cleanobj_fast_depend_hack: .PHONY
 	    ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \
 		echo Removing stale dependencies for ${f} syscall wrappers; \
 		rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \
-		   ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*; \
+		   ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}; \
 	fi
 .endif
 .endfor
@@ -793,7 +793,7 @@ _cleanobj_fast_depend_hack: .PHONY
 	    ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.o; then \
 		echo Removing stale dependencies for ${f} syscall wrappers; \
 		rm -f ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \
-		   ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*; \
+		   ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}; \
 	fi
 .endif
 .endfor
@@ -805,8 +805,8 @@ _cleanobj_fast_depend_hack: .PHONY
 	@echo Removing stale generated ${f} syscall files
 	@rm -f ${OBJTREE}${.CURDIR}/lib/libc/${f}.* \
 	    ${OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.* \
-	    ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/${f}.* \
-	    ${OBJTREE}${.CURDIR}/world32/${.CURDIR}/lib/libc/.depend.${f}.*
+	    ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/${f}.*} \
+	    ${LIBCOMPAT:D${LIBCOMPAT_OBJTREE}${.CURDIR}/lib/libc/.depend.${f}.*}
 .endif
 .endfor