Apply a big hammer for stale pre-OpenZFS files
-DNO_CLEAN builds have had trouble across the OpenZFS import. It's not worth the effort to try to address this with any granularity; instead, just trigger on a .depend file indicating a tree from before the import, and remove the whole cddl object tree. Reviewed by: mmacy, kevans Differential Revision: https://reviews.freebsd.org/D26189
This commit is contained in:
parent
0bdf7b18d1
commit
6a5646afe5
@ -43,3 +43,11 @@ clean_dep lib/libc shm_open S
|
||||
clean_dep lib/libomp ittnotify_static c
|
||||
# 20200414 r359930 closefrom
|
||||
clean_dep lib/libc closefrom S
|
||||
|
||||
# 20200826 r364746 OpenZFS merge, apply a big hammer (remove whole tree)
|
||||
if [ -e "$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o ] && \
|
||||
egrep -qw "cddl/contrib/opensolaris/lib/libzfs/common/libzfs_changelist.c" \
|
||||
"$OBJTOP"/cddl/lib/libzfs/.depend.libzfs_changelist.o; then
|
||||
echo "Removing old ZFS tree"
|
||||
rm -rf "$OBJTOP"/cddl "$OBJTOP"/obj-lib32/cddl
|
||||
fi
|
||||
|
Loading…
Reference in New Issue
Block a user