aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon J. Gerraty <sjg@FreeBSD.org>2015-06-11 13:53:15 +0000
committerSimon J. Gerraty <sjg@FreeBSD.org>2015-06-11 13:53:15 +0000
commite5b44e374327793ac2df0124052fa760f1594af4 (patch)
treec7375adb5dbf44bf94bc083ed16c454b3fe5c452
parent92f755617b90bd35dc5754b6ca4e13293b9ec9cc (diff)
downloadsrc-e5b44e374327793ac2df0124052fa760f1594af4.tar.gz
src-e5b44e374327793ac2df0124052fa760f1594af4.zip
With MK_AUTO_OBJ=yes objdir is created during sys.mk
If a makefile sets NO_OBJ, we should honor that by setting .OBJDIR back to .CURDIR
Notes
Notes: svn path=/projects/bmake/; revision=284263
-rw-r--r--share/mk/bsd.obj.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk
index 4cb8d2bde8eb..f94181a74791 100644
--- a/share/mk/bsd.obj.mk
+++ b/share/mk/bsd.obj.mk
@@ -47,6 +47,10 @@ __<bsd.obj.mk>__:
objwarn:
obj:
CANONICALOBJDIR= ${.OBJDIR}
+.if defined(NO_OBJ)
+# but this makefile does not want it!
+.OBJDIR: ${.CURDIR}
+.endif
.elif defined(MAKEOBJDIRPREFIX)
CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR}
.elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != ""