Date: Tue, 18 Apr 2017 15:26:45 -0700 From: "Simon J. Gerraty" <sjg@juniper.net> To: Bryan Drewery <bdrewery@freebsd.org> Cc: "Ngie Cooper (yaneurabeya)" <yaneurabeya@gmail.com>, FreeBSD Current <current@freebsd.org>, <sjg@juniper.net> Subject: Re: buildkernel broken for META_MODE Message-ID: <38914.1492554405@kaos.jnpr.net> In-Reply-To: <8a4e0cd6-c494-3222-f166-bc424d6d2873@FreeBSD.org> References: <D39E557A-D7B4-4285-95D9-9FD8F0D4F335@gmail.com> <d1700f26-b086-aefb-8f86-025a7481304c@FreeBSD.org> <11023f9a-f057-4306-6d27-69194395de58@FreeBSD.org> <37722.1492551184@kaos.jnpr.net> <8a4e0cd6-c494-3222-f166-bc424d6d2873@FreeBSD.org>
next in thread | previous in thread | raw e-mail | index | archive | help
> > [Creating objdir /usr/obj/usr/obj/root/git/freebsd/sys/GENERIC...]
> Wrong^
>
> Note we have 'cd /usr/obj/....' and 'MAKEOBJDIRPREFIX=/usr/obj' in
> there, so we get a nested /usr/obj/.CURDIR problem of /usr/obj/usr/obj.
The following would probably help that case:
Index: auto.obj.mk
===================================================================
RCS file: /volume/cvs/sjg/mk/auto.obj.mk,v
retrieving revision 1.13
diff -u -p -r1.13 auto.obj.mk
--- auto.obj.mk 24 Mar 2017 20:53:22 -0000 1.13
+++ auto.obj.mk 18 Apr 2017 22:25:08 -0000
@@ -41,6 +41,10 @@ MKOBJDIRS= auto
# Use __objdir here so it is easier to tweak without impacting
# the logic.
.if !empty(MAKEOBJDIRPREFIX)
+.if ${.CURDIR:M${MAKEOBJDIRPREFIX}/*} != ""
+# we are already in obj tree!
+__objdir?= ${.CURDIR}
+.endif
__objdir?= ${MAKEOBJDIRPREFIX}${.CURDIR}
.endif
__objdir?= ${MAKEOBJDIR:Uobj}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?38914.1492554405>