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

2019-10-16 Thread Bryan Drewery
On 10/16/2019 10:18 AM, Brooks Davis wrote:
> On Wed, Oct 16, 2019 at 01:20:36PM +, Warner Losh wrote:
>> Author: imp
>> Date: Wed Oct 16 13:20:36 2019
>> New Revision: 353639
>> URL: https://svnweb.freebsd.org/changeset/base/353639
>>
>> Log:
>>   bsd.compat.mk isn't setup to be included outside of Makefile.inc so 
>> comment it
>>   out here until that's sorted out. Otherwise the build is broken. when
>>   TARGET_ARCH isn't defined.
> 
> Thanks for committing this workaround.  I forgot to test bare builds (not
> buildworld/buildenv/...) because I almost always cross build (either for a
> different arch or targeting CURRENT from STABLE).
> 
> I'm currently testing a switch from TARGET_ARCH to MACHINE_ARCH and
> TARGET_CPUTYPE to CPUTYPE.
> 
> -- Brooks
> 

As a hack you could do
.if defined(SRCTOP)
.include 
.endif

Or rename it src.compat.mk and remove from Makefile and do
.sinclude 

-- 
Regards,
Bryan Drewery



signature.asc
Description: OpenPGP digital signature


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

2019-10-16 Thread Brooks Davis
On Wed, Oct 16, 2019 at 01:20:36PM +, Warner Losh wrote:
> Author: imp
> Date: Wed Oct 16 13:20:36 2019
> New Revision: 353639
> URL: https://svnweb.freebsd.org/changeset/base/353639
> 
> Log:
>   bsd.compat.mk isn't setup to be included outside of Makefile.inc so comment 
> it
>   out here until that's sorted out. Otherwise the build is broken. when
>   TARGET_ARCH isn't defined.

Thanks for committing this workaround.  I forgot to test bare builds (not
buildworld/buildenv/...) because I almost always cross build (either for a
different arch or targeting CURRENT from STABLE).

I'm currently testing a switch from TARGET_ARCH to MACHINE_ARCH and
TARGET_CPUTYPE to CPUTYPE.

-- Brooks


signature.asc
Description: PGP signature


svn commit: r353639 - head/share/mk

2019-10-16 Thread Warner Losh
Author: imp
Date: Wed Oct 16 13:20:36 2019
New Revision: 353639
URL: https://svnweb.freebsd.org/changeset/base/353639

Log:
  bsd.compat.mk isn't setup to be included outside of Makefile.inc so comment it
  out here until that's sorted out. Otherwise the build is broken. when
  TARGET_ARCH isn't defined.

Modified:
  head/share/mk/bsd.prog.mk

Modified: head/share/mk/bsd.prog.mk
==
--- head/share/mk/bsd.prog.mk   Wed Oct 16 09:29:01 2019(r353638)
+++ head/share/mk/bsd.prog.mk   Wed Oct 16 13:20:36 2019(r353639)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 .include 
-.include 
+# .include 
 .include 
 .include 
 
___
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"