Author: bdrewery
Date: Tue Apr 7 17:07:04 2020
New Revision: 359705
URL: https://svnweb.freebsd.org/changeset/base/359705
Log:
NO_OBJ: Always fix .OBJDIR regardless of AUTO_OBJ.
Sponsored by: Dell EMC
MFC after: 2 weeks
Modified:
head/share/mk/bsd.init.mk
head/share/mk/bsd.obj.mk
Modified: head/share/mk/bsd.init.mk
==============================================================================
--- head/share/mk/bsd.init.mk Tue Apr 7 17:06:33 2020 (r359704)
+++ head/share/mk/bsd.init.mk Tue Apr 7 17:07:04 2020 (r359705)
@@ -11,11 +11,9 @@ __<bsd.init.mk>__:
.include <bsd.opts.mk>
.-include "local.init.mk"
-.if ${MK_AUTO_OBJ} == "yes"
# This is also done in bsd.obj.mk
.if defined(NO_OBJ) && ${.OBJDIR} != ${.CURDIR}
.OBJDIR: ${.CURDIR}
-.endif
.endif
.if exists(${.CURDIR}/../Makefile.inc)
Modified: head/share/mk/bsd.obj.mk
==============================================================================
--- head/share/mk/bsd.obj.mk Tue Apr 7 17:06:33 2020 (r359704)
+++ head/share/mk/bsd.obj.mk Tue Apr 7 17:07:04 2020 (r359705)
@@ -42,16 +42,16 @@
__<bsd.obj.mk>__:
.include <bsd.own.mk>
-.if ${MK_AUTO_OBJ} == "yes"
-# it is done by now
-objwarn: .PHONY
-obj: .PHONY
-CANONICALOBJDIR= ${.OBJDIR}
# This is also done in bsd.init.mk
.if defined(NO_OBJ) && ${.OBJDIR} != ${.CURDIR}
# but this makefile does not want it!
.OBJDIR: ${.CURDIR}
.endif
+.if ${MK_AUTO_OBJ} == "yes"
+# it is done by now
+objwarn: .PHONY
+obj: .PHONY
+CANONICALOBJDIR= ${.OBJDIR}
# Handle special case where SRCS is full-pathed and requires
# nested objdirs. This duplicates some auto.obj.mk logic.
.if (!empty(SRCS:M*/*) || !empty(DPSRCS:M*/*)) && \
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
