diff options
| author | Ed Maste <emaste@FreeBSD.org> | 2020-08-26 04:01:06 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2020-08-26 04:01:06 +0000 |
| commit | 6a5646afe509bba2b9a31813c0c1f4a862933826 (patch) | |
| tree | cf945fc4108ff14dfdd5308b7601ad09d131cb07 /tools | |
| parent | 0bdf7b18d15239b5028306ee30d137982e674f6e (diff) | |
| download | src-6a5646afe509bba2b9a31813c0c1f4a862933826.tar.gz src-6a5646afe509bba2b9a31813c0c1f4a862933826.zip | |
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
Notes
Notes:
svn path=/head/; revision=364802
Diffstat (limited to 'tools')
| -rwxr-xr-x | tools/build/depend-cleanup.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh index c5497b75e4aa..6ef8ef182b5a 100755 --- a/tools/build/depend-cleanup.sh +++ b/tools/build/depend-cleanup.sh @@ -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 |