diff options
author | Ed Maste <emaste@FreeBSD.org> | 2018-12-10 14:50:11 +0000 |
---|---|---|
committer | Ed Maste <emaste@FreeBSD.org> | 2018-12-10 14:50:11 +0000 |
commit | 457e6311ad4cee35d10272773f1c459d7775f3cf (patch) | |
tree | 845fb6ab727abede7ca788f70940b2939ace82b7 /Makefile.inc1 | |
parent | 2d0a6ce24ce37213f7e502a6e42d050e647dfae7 (diff) | |
download | src-test2-457e6311ad4cee35d10272773f1c459d7775f3cf.tar.gz src-test2-457e6311ad4cee35d10272773f1c459d7775f3cf.zip |
Clean stale wpa dependencies and objects after r341759
The wpa update added some source files with the same name as a file in
another directory (found via .PATH in the previous version). Having a
stale entry in a .depend file means the new file won't be built, so test
for this case and if found remove all of wpa's dependency files.
MFC with: r341759
Sponsored by: The FreeBSD Foundation
Notes
Notes:
svn path=/head/; revision=341796
Diffstat (limited to 'Makefile.inc1')
-rw-r--r-- | Makefile.inc1 | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Makefile.inc1 b/Makefile.inc1 index f78da3722c88..e39c0ca3d79a 100644 --- a/Makefile.inc1 +++ b/Makefile.inc1 @@ -977,6 +977,14 @@ _cleanobj_fast_depend_hack: .PHONY rm -f ${OBJTOP}/usr.sbin/ntp/libntpevent/.depend.*; \ fi +# 20181209 r341759 track migration across wpa update + @if [ -e "${OBJTOP}/usr.sbin/wpa/wpa_supplicant/.depend.rrm.o" ] && \ + egrep -q 'src/ap/rrm.c' \ + ${OBJTOP}/usr.sbin/wpa/wpa_supplicant/.depend.rrm.o; then \ + echo "Removing stale wpa dependencies and objects"; \ + rm -f ${OBJTOP}/usr.sbin/wpa/*/.depend*; \ + fi + _worldtmp: .PHONY @echo @echo "--------------------------------------------------------------" |