Author: bdrewery
Date: Wed Dec 6 21:00:41 2017
New Revision: 326634
URL: https://svnweb.freebsd.org/changeset/base/326634
Log:
AUTO_OBJ: Don't create nested OBJDIRS with print-dir or make -n.
Sponsored by: Dell EMC
Modified:
head/share/mk/bsd.obj.mk
Modified: head/share/mk/bsd.obj.mk
==============================================================================
--- head/share/mk/bsd.obj.mk Wed Dec 6 20:23:38 2017 (r326633)
+++ head/share/mk/bsd.obj.mk Wed Dec 6 21:00:41 2017 (r326634)
@@ -55,7 +55,8 @@ 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*/*)) && \
- (${.TARGETS} == "" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} != "")
+ (${.TARGETS} == "" || ${.TARGETS:Nclean*:N*clean:Ndestroy*} != "") && \
+ !make(print-dir) && empty(.MAKEFLAGS:M-[nN])
_wantdirs= ${SRCS:M*/*:H} ${DPSRCS:M*/*:H}
.if !empty(_wantdirs)
_wantdirs:= ${_wantdirs:O:u}
_______________________________________________
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"
