diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-06-10 18:09:05 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2015-06-10 18:09:05 +0000 |
| commit | 4cc6b8394f5e639f942efca8d057fa7cad9be235 (patch) | |
| tree | 0b51c2bb7667f734ebd634583d74b423967fae98 | |
| parent | b589e6297b06281cfa576521ac9a255566627438 (diff) | |
| download | src-4cc6b8394f5e639f942efca8d057fa7cad9be235.tar.gz src-4cc6b8394f5e639f942efca8d057fa7cad9be235.zip | |
If MK_AUTO_OBJ==yes, it is done before bsd.obj.mk included
Notes
Notes:
svn path=/projects/bmake/; revision=284231
| -rw-r--r-- | share/mk/bsd.obj.mk | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index b87b4243314f..00408cb6aeeb 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -42,7 +42,12 @@ __<bsd.obj.mk>__: .include <bsd.own.mk> -.if defined(MAKEOBJDIRPREFIX) +.if ${MK_AUTO_OBJ} == "yes" +# it is done by now +objwarn: +obj: +CANONICALOBJDIR= ${.OBJDIR} +.elif defined(MAKEOBJDIRPREFIX) CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR} .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != "" CANONICALOBJDIR:=${MAKEOBJDIR} @@ -50,15 +55,6 @@ CANONICALOBJDIR:=${MAKEOBJDIR} CANONICALOBJDIR:=/usr/obj${.CURDIR} .endif -.if defined(.PARSEDIR) && !defined(NO_OBJ) && !defined(NO_AUTO_OBJ) -.if ${MK_AUTO_OBJ} == "yes" -__objdir?= ${CANONICALOBJDIR} -# this is what auto.obj.mk wants to see -MKOBJDIRS=auto -.include "auto.obj.mk" -.endif -.endif - # # Warn of unorthodox object directory. # |