diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2015-12-15 01:37:46 +0000 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2015-12-15 01:37:46 +0000 |
| commit | 4d74a8776e38c0e3fb01c22789d37d00bd812ecb (patch) | |
| tree | fdc8f4df7821a6ea5d0f62c7b0a0d4d41b5116b6 | |
| parent | 54d1dbbb2e0a9d77a49858deb67e7f9c8d854165 (diff) | |
| download | FreeBSD-src-4d74a8776e38c0e3fb01c22789d37d00bd812ecb.zip FreeBSD-src-4d74a8776e38c0e3fb01c22789d37d00bd812ecb.tar.gz | |
Partial MFC r291349:
Standardize on OBJTOP in and outside of META MODE.
For stable/10 this means bringing OBJTOP support in which simplifies
MFCs.
| -rw-r--r-- | share/mk/bsd.obj.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/share/mk/bsd.obj.mk b/share/mk/bsd.obj.mk index a5e8e73..3745f1b 100644 --- a/share/mk/bsd.obj.mk +++ b/share/mk/bsd.obj.mk @@ -46,10 +46,13 @@ __<bsd.obj.mk>__: CANONICALOBJDIR:=${MAKEOBJDIRPREFIX}${.CURDIR} .elif defined(MAKEOBJDIR) && ${MAKEOBJDIR:M/*} != "" CANONICALOBJDIR:=${MAKEOBJDIR} +OBJTOP?= ${MAKEOBJDIR} .else CANONICALOBJDIR:=/usr/obj${.CURDIR} .endif +OBJTOP?= ${.OBJDIR:S,${.CURDIR},,}${SRCTOP} + # # Warn of unorthodox object directory. # |
