Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F97332449
D38447.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Mute Notifications
Flag For Later
Award Token
Size
1 KB
Referenced Files
None
Subscribers
None
D38447.diff
View Options
diff --git a/Makefile.inc1 b/Makefile.inc1
--- a/Makefile.inc1
+++ b/Makefile.inc1
@@ -1062,6 +1062,9 @@
@echo "--------------------------------------------------------------"
@echo ">>> stage 1.2: bootstrap tools"
@echo "--------------------------------------------------------------"
+.if ${MK_CLEAN} != "yes"
+ ${_+_}cd ${.CURDIR}; ${BMAKE} _NO_INCLUDE_COMPILERMK=t _cleanobj_fast_depend_hack
+.endif
${_+_}cd ${.CURDIR}; ${BMAKE} bootstrap-tools
mkdir -p ${WORLDTMP}/usr ${WORLDTMP}/lib/casper ${WORLDTMP}/lib/geom \
${WORLDTMP}/bin
diff --git a/tools/build/depend-cleanup.sh b/tools/build/depend-cleanup.sh
--- a/tools/build/depend-cleanup.sh
+++ b/tools/build/depend-cleanup.sh
@@ -28,18 +28,8 @@
# $3 source extension
clean_dep()
{
- if [ -e "$OBJTOP"/$1/.depend.$2.pico ] && \
- egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.pico; then \
- echo "Removing stale dependencies and objects for $2.$3"; \
- rm -f \
- "$OBJTOP"/$1/.depend.$2.* \
- "$OBJTOP"/$1/$2.*o \
- "$OBJTOP"/obj-lib32/$1/.depend.$2.* \
- "$OBJTOP"/obj-lib32/$1/$2.*o
- fi
- if [ -e "$OBJTOP"/$1/.depend.$2.o ] && \
- egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.o; then \
- echo "Removing stale dependencies and objects for $2.$3"; \
+ if egrep -qw "$2\.$3" "$OBJTOP"/$1/.depend.$2.*o 2>/dev/null; then
+ echo "Removing stale dependencies and objects for $2.$3"
rm -f \
"$OBJTOP"/$1/.depend.$2.* \
"$OBJTOP"/$1/$2.*o \
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Sun, Sep 29, 5:19 PM (21 h, 50 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
13143050
Default Alt Text
D38447.diff (1 KB)
Attached To
Mode
D38447: depend-cleanup.sh: Simplify the logic, and clean bootstrap tools.
Attached
Detach File
Event Timeline
Log In to Comment