summaryrefslogtreecommitdiffstats
path: root/share
diff options
context:
space:
mode:
authorsjg <sjg@FreeBSD.org>2015-06-11 13:53:15 +0000
committersjg <sjg@FreeBSD.org>2015-06-11 13:53:15 +0000
commit95ce3d52834fab2640a307d9f7369be786d5a149 (patch)
treec7375adb5dbf44bf94bc083ed16c454b3fe5c452 /share
parent66ae8c26743215c37d0c6080e10f1a6c9861b3bc (diff)
downloadFreeBSD-src-95ce3d52834fab2640a307d9f7369be786d5a149.zip
FreeBSD-src-95ce3d52834fab2640a307d9f7369be786d5a149.tar.gz
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
Diffstat (limited to 'share')
-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 4cb8d2b..f94181a 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/*} != ""
OpenPOWER on IntegriCloud