svn commit: r277227 - in head/sys: amd64/conf arm/conf conf modules powerpc/conf

[Navdeep Parhar]

On Thu, Jan 15, 2015 at 06:34:31PM -0800, Nathan Whitehorn wrote:
> 
> On 01/15/15 17:39, Navdeep Parhar wrote:
> >Author: np
> >Date: Fri Jan 16 01:39:24 2015
> >New Revision: 277227
> >URL: https://svnweb.freebsd.org/changeset/base/277227
> >
> >Log:
> >   Plug cxgbe(4) back into !powerpc && !arm builds, instead of building it
> >   on amd64 only.
> >
> >Modified:
> >   head/sys/amd64/conf/NOTES
> >   head/sys/arm/conf/NOTES
> >   head/sys/conf/NOTES
> >   head/sys/modules/Makefile
> >   head/sys/powerpc/conf/NOTES
> >
> >
> >
> >Modified: head/sys/modules/Makefile
> >==============================================================================
> >--- head/sys/modules/Makefile	Fri Jan 16 01:32:40 2015	(r277226)
> >+++ head/sys/modules/Makefile	Fri Jan 16 01:39:24 2015	(r277227)
> >@@ -443,7 +443,8 @@ _ti=		ti
> >  _txp=		txp
> >  .endif
> >-.if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} == "amd64"
> >+.if ${MK_SOURCELESS_UCODE} != "no" && ${MACHINE_CPUARCH} != "arm" && \
> >+	${MACHINE_CPUARCH} != "powerpc"
> >  _cxgbe=		cxgbe
> >  .endif
> 
> Don't you want MACHINE_ARCH != powerpc here rather than
> MACHINE_CPUARCH if it builds on powerpc64?
> -Nathan

Hmm, I think you're right.  I'll try building with MACHINE_ARCH and commit if
it succeeds.

Regards,
Navdeep