From owner-svn-src-stable-7@FreeBSD.ORG  Tue Mar 23 21:39:34 2010
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 0BB90106567B;
	Tue, 23 Mar 2010 21:39:34 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EF0C58FC2D;
	Tue, 23 Mar 2010 21:39:33 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o2NLdX2t094869;
	Tue, 23 Mar 2010 21:39:33 GMT (envelope-from jhb@svn.freebsd.org)
Received: (from jhb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o2NLdXQQ094867;
	Tue, 23 Mar 2010 21:39:33 GMT (envelope-from jhb@svn.freebsd.org)
Message-Id: <201003232139.o2NLdXQQ094867@svn.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Tue, 23 Mar 2010 21:39:33 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r205539 - stable/7/sys/boot/i386/loader
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 23 Mar 2010 21:39:34 -0000

Author: jhb
Date: Tue Mar 23 21:39:33 2010
New Revision: 205539
URL: http://svn.freebsd.org/changeset/base/205539

Log:
  Enable the ability to build ZFS into the loader so that /boot/zfsloader
  actually contains ZFS support.
  
  Submitted by:	Alexander Zagrebin  alexz of visp ru

Modified:
  stable/7/sys/boot/i386/loader/Makefile

Modified: stable/7/sys/boot/i386/loader/Makefile
==============================================================================
--- stable/7/sys/boot/i386/loader/Makefile	Tue Mar 23 21:38:41 2010	(r205538)
+++ stable/7/sys/boot/i386/loader/Makefile	Tue Mar 23 21:39:33 2010	(r205539)
@@ -17,12 +17,12 @@ LIBFIREWIRE=	${.OBJDIR}/../libfirewire/l
 .endif
 
 # Set by zfsloader Makefile
-#.if ${MK_ZFS} != "no"
-#CFLAGS+=	-DLOADER_ZFS_SUPPORT
-#LIBZFS=		${.OBJDIR}/../../zfs/libzfsboot.a
-#.else
+.if defined(LOADER_ZFS_SUPPORT)
+CFLAGS+=	-DLOADER_ZFS_SUPPORT
+LIBZFS=		${.OBJDIR}/../../zfs/libzfsboot.a
+.else
 LIBZFS=
-#.endif
+.endif
 
 # Enable PXE TFTP or NFS support, not both.
 .if defined(LOADER_TFTP_SUPPORT)