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
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
