Date: Fri, 29 Jun 2012 13:02:46 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-8@freebsd.org Subject: svn commit: r237779 - stable/8/sys/boot Message-ID: <201206291302.q5TD2krY047170@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Fri Jun 29 13:02:46 2012 New Revision: 237779 URL: http://svn.freebsd.org/changeset/base/237779 Log: fix a mismerge in r237765 sys/boot stable/8 doesn't have Makefile.spac64, instead it has spar64-specific blocks in Makefile. This is a direct commit. Pointyhat to: avg Modified: stable/8/sys/boot/Makefile Modified: stable/8/sys/boot/Makefile ============================================================================== --- stable/8/sys/boot/Makefile Fri Jun 29 13:00:28 2012 (r237778) +++ stable/8/sys/boot/Makefile Fri Jun 29 13:02:46 2012 (r237779) @@ -22,7 +22,7 @@ SUBDIR+= ofw SUBDIR+= uboot .endif -.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" +.if ${MACHINE_ARCH} == "amd64" || ${MACHINE} == "i386" || ${MACHINE_ARCH} == "sparc64" SUBDIR+= zfs .endif
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201206291302.q5TD2krY047170>