Page Menu
Home
FreeBSD
Search
Configure Global Search
Log In
Files
F177655535
D4336.1794958619.diff
No One
Temporary
Actions
View File
Edit File
Delete File
View Transforms
Subscribe
Flag For Later
Award Token
Authored By
Unknown
Size
1 KB
Referenced Files
None
Subscribers
None
D4336.1794958619.diff
View Options
Index: head/sys/conf/kern.pre.mk
===================================================================
--- head/sys/conf/kern.pre.mk
+++ head/sys/conf/kern.pre.mk
@@ -206,9 +206,8 @@
SYSTEM_DEP+= ${LDSCRIPT}
# Calculate path for .m files early, if needed.
-.if !defined(_MPATH)
+.if !defined(__MPATH)
__MPATH!=find ${S:tA}/ -name \*_if.m
-_MPATH=${__MPATH:H:O:u}
.endif
# MKMODULESENV is set here so that port makefiles can augment
@@ -227,7 +226,7 @@
.if defined(DEBUG)
MKMODULESENV+= DEBUG_FLAGS="${DEBUG}"
.endif
-MKMODULESENV+= _MPATH="${_MPATH}"
+MKMODULESENV+= __MPATH="${__MPATH}"
# Architecture and output format arguments for objdump to convert image to
# object file
Index: head/sys/conf/kmod.mk
===================================================================
--- head/sys/conf/kmod.mk
+++ head/sys/conf/kmod.mk
@@ -370,14 +370,18 @@
.endif
# Build _if.[ch] from _if.m, and clean them when we're done.
-.if !defined(_MPATH)
+.if !defined(__MPATH)
__MPATH!=find ${SYSDIR:tA}/ -name \*_if.m
-_MPATH=${__MPATH:H:O:u}
.endif
+_MFILES=${__MPATH:T:O}
+_MPATH=${__MPATH:H:O:u}
.PATH.m: ${_MPATH}
.for _i in ${SRCS:M*_if.[ch]}
-#removes too much, comment out until it's more constrained.
-#CLEANFILES+= ${_i}
+_MATCH=M${_i:R:S/$/.m/}
+_MATCHES=${_MFILES:${_MATCH}}
+.if !empty(_MATCHES)
+CLEANFILES+= ${_i}
+.endif
.endfor # _i
.m.c: ${SYSDIR}/tools/makeobjops.awk
${AWK} -f ${SYSDIR}/tools/makeobjops.awk ${.IMPSRC} -c
File Metadata
Details
Attached
Mime Type
text/plain
Expires
Tue, Nov 17, 11:36 PM (15 h, 42 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
41810499
Default Alt Text
D4336.1794958619.diff (1 KB)
Attached To
Mode
D4336: Restore cleaning of auto-generated kobj files.
Attached
Detach File
Event Timeline