If MK_AUTO_OBJ==yes, it is done before bsd.obj.mk included
This commit is contained in:
+6
-10
@@ -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.
|
||||
#
|
||||
|
||||
Reference in New Issue
Block a user