svn commit: r284650 - head/share/mk
Warner Losh
imp at bsdimp.com
Sat Jun 20 22:57:11 UTC 2015
> On Jun 20, 2015, at 3:48 PM, Simon J. Gerraty <sjg at FreeBSD.org> wrote:
>
> Author: sjg
> Date: Sat Jun 20 21:48:07 2015
> New Revision: 284650
> URL: https://svnweb.freebsd.org/changeset/base/284650
>
> Log:
> Deal with MAKEOBJDIRPREFIX
>
> MAKEOBJDIRPREFIX does not really fit our model.
> Use it to set OBJROOT to about where user expects
> and set MAKEOBJDIR to do what we want.
>
> Modified:
> head/share/mk/local.meta.sys.mk
>
> Modified: head/share/mk/local.meta.sys.mk
> ==============================================================================
> --- head/share/mk/local.meta.sys.mk Sat Jun 20 20:54:05 2015 (r284649)
> +++ head/share/mk/local.meta.sys.mk Sat Jun 20 21:48:07 2015 (r284650)
> @@ -8,6 +8,18 @@
> MK_INSTALL_AS_USER= yes
>
> .if empty(OBJROOT) || ${.MAKE.LEVEL} == 0
> +.if defined(MAKEOBJDIRPREFIX) && exists(${MAKEOBJDIRPREFIX})
> +.warning MAKEOBJDIRPREFIX not supported; setting MAKEOBJDIR...
> +# put things approximately where they want
> +OBJROOT:=${MAKEOBJDIRPREFIX}${SRCTOP:S,/src,,}/
> +# OBJTOP set below
> +MAKEOBJDIR=$${.CURDIR:S,$${SRCTOP},$${OBJTOP},}
> +MAKEOBJDIRPREFIX=
> +# export but do not track
> +.export-env MAKEOBJDIRPREFIX MAKEOBJDIR
> +# now for our own use
> +MAKEOBJDIR= ${.CURDIR:S,${SRCTOP},${OBJTOP},}
> +.endif
> .if !empty(SB)
> SB_OBJROOT ?= ${SB}/obj/
> # this is what we use below
MAKEOBJDIRPREFIX has been *THE* way to do things in FreeBSD since ~forever.
How does it not fit our model? It is our model. This change is ill advised.
Also, this change will generate about a billion warnings for a buildworld (one per makefile,
per tree traverse). That’s not acceptable.
Warner
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 842 bytes
Desc: Message signed with OpenPGP using GPGMail
URL: <http://lists.freebsd.org/pipermail/svn-src-all/attachments/20150620/473e79be/attachment.sig>
More information about the svn-src-all
mailing list