From owner-svn-src-head@FreeBSD.ORG Tue Feb 25 18:00:56 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 272F7717; Tue, 25 Feb 2014 18:00:56 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 12C211574; Tue, 25 Feb 2014 18:00:56 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s1PI0tpN036412; Tue, 25 Feb 2014 18:00:55 GMT (envelope-from sbruno@svn.freebsd.org) Received: (from sbruno@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s1PI0tJP036411; Tue, 25 Feb 2014 18:00:55 GMT (envelope-from sbruno@svn.freebsd.org) Message-Id: <201402251800.s1PI0tJP036411@svn.freebsd.org> From: Sean Bruno Date: Tue, 25 Feb 2014 18:00:55 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r262487 - head/sys/boot/userboot/userboot X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 25 Feb 2014 18:00:56 -0000 Author: sbruno Date: Tue Feb 25 18:00:55 2014 New Revision: 262487 URL: http://svnweb.freebsd.org/changeset/base/262487 Log: Teach userboot to comply with WITHOUT_CDDL/WITHOUT_ZFS Apparently, LIBZFS is set to a non-empty string when WITHOUT_CDDL/WITHOUT_ZFS are set, I think this is a bug, but work around this feature for now. Reviewed by: grehan Modified: head/sys/boot/userboot/userboot/Makefile Modified: head/sys/boot/userboot/userboot/Makefile ============================================================================== --- head/sys/boot/userboot/userboot/Makefile Tue Feb 25 17:51:41 2014 (r262486) +++ head/sys/boot/userboot/userboot/Makefile Tue Feb 25 18:00:55 2014 (r262487) @@ -51,10 +51,12 @@ LIBFICL= ${.OBJDIR}/../ficl/libficl.a LIBSTAND= ${.OBJDIR}/../libstand/libstand.a .endif +.if ${MK_CDDL} != "no" .if ${MK_ZFS} != "no" CFLAGS+= -DUSERBOOT_ZFS_SUPPORT LIBZFS= ${.OBJDIR}/../zfs/libzfsboot.a .endif +.endif # Always add MI sources .PATH: ${.CURDIR}/../../common