Re: svn commit: r359705 - head/share/mk

2020-04-07 Thread Kyle Evans 
On Tue, Apr 7, 2020 at 4:49 PM Simon J. Gerraty  wrote:
>
> Kyle Evans  wrote:
> > universe13a% make -C stand -V .OBJDIR
> > /scratch/tmp/kevans/obj/home/kevans/head/amd64.amd64/stand
> >
> > But in a buildenv:
> > universe13a% make TARGET_ARCH=armv7 buildenv
> > Entering world for armv7:arm
> > For ZSH you must run: export CPUTYPE=
> > universe13a% make -C stand -V .OBJDIR
> > [Creating objdir /scratch/tmp/kevans/obj/home/kevans/head/stand...]
> > /scratch/tmp/kevans/obj/home/kevans/head/stand
>
> What do you get for:
>
> env | grep MAKE
>

It turned out I had export MAKEOBJDIRPREFIX=... in my ~/.zshrc on this
particular machine that was polluting the buildenv- Bryan investigated
a bit (via IRC) and we came to the conclusion that I should not do
that, or at least not do that for BUILDENV. I'm happy with this
solution, as it's only in there to allow me to be lazy on universe
machines. =-)

Thanks,

Kyle Evans
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r359705 - head/share/mk

2020-04-07 Thread Simon J. Gerraty via svn-src-head 
Kyle Evans  wrote:
> universe13a% make -C stand -V .OBJDIR
> /scratch/tmp/kevans/obj/home/kevans/head/amd64.amd64/stand
> 
> But in a buildenv:
> universe13a% make TARGET_ARCH=armv7 buildenv
> Entering world for armv7:arm
> For ZSH you must run: export CPUTYPE=
> universe13a% make -C stand -V .OBJDIR
> [Creating objdir /scratch/tmp/kevans/obj/home/kevans/head/stand...]
> /scratch/tmp/kevans/obj/home/kevans/head/stand

What do you get for:

env | grep MAKE


> Using buildenv with BUILDENV_SHELL="make -C stand -V .OBDJIR"
> *doesn't* reproduce it (objdir has arm.armv7 in it again).
> 
> I tried with both zsh (and export CPUTYPE=) and /bin/sh, but it seems
> to reproduce both ways.
> 
> Thanks,
> 
> Kyle Evans
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

Re: svn commit: r359705 - head/share/mk

2020-04-07 Thread Bryan Drewery 
On 4/7/2020 10:13 AM, Kyle Evans wrote:
> On Tue, Apr 7, 2020 at 12:07 PM Bryan Drewery  wrote:
>>
>> Author: bdrewery
>> Date: Tue Apr  7 17:07:04 2020
>> New Revision: 359705
>> URL: https://svnweb.freebsd.org/changeset/base/359705
>>
>> Log:
>>   NO_OBJ: Always fix .OBJDIR regardless of AUTO_OBJ.
>>
>>   Sponsored by: Dell EMC
>>   MFC after:2 weeks
>>
>> Modified:
>>   head/share/mk/bsd.init.mk
>>   head/share/mk/bsd.obj.mk
>>
> 
> Unrelated, but something else that's kinda funky:
> 
> universe13a% make -C stand -V .OBJDIR
> /scratch/tmp/kevans/obj/home/kevans/head/amd64.amd64/stand
> 
> But in a buildenv:
> universe13a% make TARGET_ARCH=armv7 buildenv
> Entering world for armv7:arm
> For ZSH you must run: export CPUTYPE=
> universe13a% make -C stand -V .OBJDIR
> [Creating objdir /scratch/tmp/kevans/obj/home/kevans/head/stand...]
> /scratch/tmp/kevans/obj/home/kevans/head/stand
> 
> Using buildenv with BUILDENV_SHELL="make -C stand -V .OBDJIR"
> *doesn't* reproduce it (objdir has arm.armv7 in it again).
> 
> I tried with both zsh (and export CPUTYPE=) and /bin/sh, but it seems
> to reproduce both ways.
> 
> Thanks,
> 
> Kyle Evans
> 

Discussed with Kyle on IRC. Turned out to be an 'export
MAKEOBJDIRPREFIX=/something' in ~/.profile.

I suggest something like this in the profile:

if [ -n "${BUILDENV}" ]; then
PS1="(buildenv) ${PS1}"
unset CPUTYPE
else
export MAKEOBJDIRPREFIX=/whatever
fi


-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature

Re: svn commit: r359705 - head/share/mk

2020-04-07 Thread Kyle Evans 
On Tue, Apr 7, 2020 at 12:07 PM Bryan Drewery  wrote:
>
> Author: bdrewery
> Date: Tue Apr  7 17:07:04 2020
> New Revision: 359705
> URL: https://svnweb.freebsd.org/changeset/base/359705
>
> Log:
>   NO_OBJ: Always fix .OBJDIR regardless of AUTO_OBJ.
>
>   Sponsored by: Dell EMC
>   MFC after:2 weeks
>
> Modified:
>   head/share/mk/bsd.init.mk
>   head/share/mk/bsd.obj.mk
>

Unrelated, but something else that's kinda funky:

universe13a% make -C stand -V .OBJDIR
/scratch/tmp/kevans/obj/home/kevans/head/amd64.amd64/stand

But in a buildenv:
universe13a% make TARGET_ARCH=armv7 buildenv
Entering world for armv7:arm
For ZSH you must run: export CPUTYPE=
universe13a% make -C stand -V .OBJDIR
[Creating objdir /scratch/tmp/kevans/obj/home/kevans/head/stand...]
/scratch/tmp/kevans/obj/home/kevans/head/stand

Using buildenv with BUILDENV_SHELL="make -C stand -V .OBDJIR"
*doesn't* reproduce it (objdir has arm.armv7 in it again).

I tried with both zsh (and export CPUTYPE=) and /bin/sh, but it seems
to reproduce both ways.

Thanks,

Kyle Evans
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"

svn commit: r359705 - head/share/mk

2020-04-07 Thread Bryan Drewery 
Author: bdrewery
Date: Tue Apr  7 17:07:04 2020
New Revision: 359705
URL: https://svnweb.freebsd.org/changeset/base/359705

Log:
  NO_OBJ: Always fix .OBJDIR regardless of AUTO_OBJ.
  
  Sponsored by: Dell EMC
  MFC after:2 weeks

Modified:
  head/share/mk/bsd.init.mk
  head/share/mk/bsd.obj.mk

Modified: head/share/mk/bsd.init.mk
==
--- head/share/mk/bsd.init.mk   Tue Apr  7 17:06:33 2020(r359704)
+++ head/share/mk/bsd.init.mk   Tue Apr  7 17:07:04 2020(r359705)
@@ -11,11 +11,9 @@ :
 .include 
 .-include "local.init.mk"
 
-.if ${MK_AUTO_OBJ} == "yes"
 # This is also done in bsd.obj.mk
 .if defined(NO_OBJ) && ${.OBJDIR} != ${.CURDIR}
 .OBJDIR: ${.CURDIR}
-.endif
 .endif
 
 .if exists(${.CURDIR}/../Makefile.inc)

Modified: head/share/mk/bsd.obj.mk
==
--- head/share/mk/bsd.obj.mkTue Apr  7 17:06:33 2020(r359704)
+++ head/share/mk/bsd.obj.mkTue Apr  7 17:07:04 2020(r359705)
@@ -42,16 +42,16 @@
 :
 .include 
 
-.if ${MK_AUTO_OBJ} == "yes"
-# it is done by now
-objwarn: .PHONY
-obj: .PHONY
-CANONICALOBJDIR= ${.OBJDIR}
 # This is also done in bsd.init.mk
 .if defined(NO_OBJ) && ${.OBJDIR} != ${.CURDIR}
 # but this makefile does not want it!
 .OBJDIR: ${.CURDIR}
 .endif
+.if ${MK_AUTO_OBJ} == "yes"
+# it is done by now
+objwarn: .PHONY
+obj: .PHONY
+CANONICALOBJDIR= ${.OBJDIR}
 # Handle special case where SRCS is full-pathed and requires
 # nested objdirs.  This duplicates some auto.obj.mk logic.
 .if (!empty(SRCS:M*/*) || !empty(DPSRCS:M*/*)) && \
___
svn-src-head@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"