Author: bdrewery
Date: Mon Nov 13 20:49:08 2017
New Revision: 325776
URL: https://svnweb.freebsd.org/changeset/base/325776
Log:
Rework r325568 so all 'make LINT' targets work.
Reported by: ngie
Sponsored by: Dell EMC Isilon
Modified:
head/Makefile
head/sys/conf/makeLINT.mk
Modified: head/Makefile
==============================================================================
--- head/Makefile Mon Nov 13 20:39:43 2017 (r325775)
+++ head/Makefile Mon Nov 13 20:49:08 2017 (r325776)
@@ -598,7 +598,7 @@ universe_${target}_kernels: universe_${target}_worlds
universe_${target}_kernels: universe_${target}_prologue .MAKE .PHONY
.if exists(${KERNSRCDIR}/${target}/conf/NOTES)
@(cd ${KERNSRCDIR}/${target}/conf && env __MAKE_CONF=/dev/null \
- ${SUB_MAKE} -DNO_OBJ LINT \
+ ${SUB_MAKE} LINT \
> ${.CURDIR}/_.${target}.makeLINT 2>&1 || \
(echo "${target} 'make LINT' failed," \
"check _.${target}.makeLINT for details"| ${MAKEFAIL}))
Modified: head/sys/conf/makeLINT.mk
==============================================================================
--- head/sys/conf/makeLINT.mk Mon Nov 13 20:39:43 2017 (r325775)
+++ head/sys/conf/makeLINT.mk Mon Nov 13 20:49:08 2017 (r325776)
@@ -1,5 +1,8 @@
# $FreeBSD$
+# The LINT files need to end up in the kernel source directory.
+.OBJDIR: ${.CURDIR}
+
all:
@echo "make LINT only"
@@ -9,9 +12,10 @@ clean:
rm -f LINT-NOINET LINT-NOINET6 LINT-NOIP
.endif
-NOTES= ../../conf/NOTES NOTES
-LINT: ${NOTES} ../../conf/makeLINT.sed
- cat ${NOTES} | sed -E -n -f ../../conf/makeLINT.sed > ${.TARGET}
+NOTES= ${.CURDIR}/../../conf/NOTES ${.CURDIR}/NOTES
+MAKELINT_SED= ${.CURDIR}/../../conf/makeLINT.sed
+LINT: ${NOTES} ${MAKELINT_SED}
+ cat ${NOTES} | sed -E -n -f ${MAKELINT_SED} > ${.TARGET}
.if ${TARGET} == "amd64" || ${TARGET} == "i386"
echo "include ${.TARGET}" > ${.TARGET}-NOINET
echo "ident ${.TARGET}-NOINET" >> ${.TARGET}-NOINET
_______________________________________________
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
