d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

depend-cleanup.sh: Handle commit cbdec8db18

Browse Source 
That commit changed libc to use the MI pdfork implementation, but with
an incremental build the object file for the pdfork.S stub lingers and
causes a linker error.

Cleaning the depend file is not enouch, so modify clean_deps() to remove
object files as well, and add a call to ensure that pdfork.*o is
cleaned.  The new file is _pdfork.o.

Reported by:	jhb
Reviewed by:	emaste
Fixes:		cbdec8db18 ("libc: Add pdfork to the list of interposed system calls")
Sponsored by:	The FreeBSD Foundation
Differential Revision:	https://reviews.freebsd.org/D33322
This commit is contained in:
Mark Johnston 2021-12-07 11:18:45 -05:00
parent 38dbca7243
commit 187fe192ce
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
tools/build/depend-cleanup.sh
View File

@ -31,8 +31,11 @@ clean_dep()
if [ -e "$OBJTOP"/$1/.depend.$2.pico ] && \
egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.pico; then \
echo "Removing stale dependencies for $2.$3"; \
rm -f "$OBJTOP"/$1/.depend.$2.* \
"$OBJTOP"/obj-lib32/$1/.depend.$2.*
rm -f \
"$OBJTOP"/$1/.depend.$2.* \
"$OBJTOP"/$1/$2.*o \
"$OBJTOP"/obj-lib32/$1/.depend.$2.* \
"$OBJTOP"/obj-lib32/$1/$2.*o
fi
}
@ -72,4 +75,6 @@ if [ -e "$OBJTOP"/lib/ncurses/ncursesw ]; then
fi
# 20210608 f20893853e8e move from atomic.S to atomic.c
clean_dep cddl/lib/libspl atomic S
clean_dep cddl/lib/libspl atomic S
# 20211207 cbdec8db18b5 switch to libthr-friendly pdfork
clean_dep lib/libc pdfork S