]> xenbits.xensource.com Git - people/julieng/freebsd.git/commitdiff
Fix delete-old and check-old-files not removing old debug symbols.
authorbdrewery <bdrewery@FreeBSD.org>
Fri, 16 Oct 2015 04:07:27 +0000 (04:07 +0000)
committerbdrewery <bdrewery@FreeBSD.org>
Fri, 16 Oct 2015 04:07:27 +0000 (04:07 +0000)
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

Makefile.inc1

index 32be188ccb261866b8b6774da0021622a253127b..53c407fa24f9972599a6f9b8bcaa3d0df08ab983 100644 (file)
@@ -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 | \