Author: bdrewery
Date: Fri Oct 16 04:07:27 2015
New Revision: 289407
URL: https://svnweb.freebsd.org/changeset/base/289407

Log:
  Fix delete-old and check-old-files not removing old debug symbols.
  
  This was handled for libraries in r256842 but for some reason was missed
  for files (bsd.prog.mk).
  
  MFC after:    1 week
  Sponsored by: EMC / Isilon Storage Division
  Relnotes:     yes

Modified:
  head/Makefile.inc1

Modified: head/Makefile.inc1
==============================================================================
--- head/Makefile.inc1  Fri Oct 16 03:21:24 2015        (r289406)
+++ head/Makefile.inc1  Fri Oct 16 04:07:27 2015        (r289407)
@@ -1996,6 +1996,13 @@ delete-old-files:
                        chflags noschg "${DESTDIR}/$${file}" 2>/dev/null || 
true; \
                        rm ${RM_I} "${DESTDIR}/$${file}" <&3; \
                fi; \
+               for ext in debug symbols; do \
+                 if ! [ -e "${DESTDIR}/$${file}" ] && [ -f \
+                     "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
+                         rm ${RM_I} "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" \
+                             <&3; \
+                 fi; \
+               done; \
        done
 # Remove catpages without corresponding manpages.
        @exec 3<&0; \
@@ -2018,6 +2025,11 @@ check-old-files:
                if [ -f "${DESTDIR}/$${file}" -o -L "${DESTDIR}/$${file}" ]; 
then \
                        echo "${DESTDIR}/$${file}"; \
                fi; \
+               for ext in debug symbols; do \
+                 if [ -f "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}" ]; then \
+                         echo "${DESTDIR}${DEBUGDIR}/$${file}.$${ext}"; \
+                 fi; \
+               done; \
        done
 # Check for catpages without corresponding manpages.
        @find ${DESTDIR}/usr/share/man/cat* ! -type d | \
_______________________________________________
[email protected] mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "[email protected]"

Reply via email to