From owner-svn-src-projects@FreeBSD.ORG Thu Mar 26 06:00:24 2015 Return-Path: Delivered-To: svn-src-projects@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id F3FA5C9B; Thu, 26 Mar 2015 06:00:23 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id DF6D597; Thu, 26 Mar 2015 06:00:23 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id t2Q60NPG061592; Thu, 26 Mar 2015 06:00:23 GMT (envelope-from rpaulo@FreeBSD.org) Received: (from rpaulo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id t2Q60N6P061591; Thu, 26 Mar 2015 06:00:23 GMT (envelope-from rpaulo@FreeBSD.org) Message-Id: <201503260600.t2Q60N6P061591@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rpaulo set sender to rpaulo@FreeBSD.org using -f From: Rui Paulo Date: Thu, 26 Mar 2015 06:00:23 +0000 (UTC) To: src-committers@freebsd.org, svn-src-projects@freebsd.org Subject: svn commit: r280672 - projects/lua-bootloader/sys/boot/userboot/userboot X-SVN-Group: projects MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-projects@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: "SVN commit messages for the src " projects" tree" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 26 Mar 2015 06:00:24 -0000 Author: rpaulo Date: Thu Mar 26 06:00:22 2015 New Revision: 280672 URL: https://svnweb.freebsd.org/changeset/base/280672 Log: Correctly set LIBSTAND in userboot Makefile. userboot doesn't yet have lua support, but this is necessary. Modified: projects/lua-bootloader/sys/boot/userboot/userboot/Makefile Modified: projects/lua-bootloader/sys/boot/userboot/userboot/Makefile ============================================================================== --- projects/lua-bootloader/sys/boot/userboot/userboot/Makefile Thu Mar 26 05:50:56 2015 (r280671) +++ projects/lua-bootloader/sys/boot/userboot/userboot/Makefile Thu Mar 26 06:00:22 2015 (r280672) @@ -48,9 +48,10 @@ BOOT_FORTH= yes CFLAGS+= -DBOOT_FORTH -I${.CURDIR}/../../ficl -I${.CURDIR}/../../ficl/i386 CFLAGS+= -DBF_DICTSIZE=15000 LIBFICL= ${.OBJDIR}/../ficl/libficl.a -LIBSTAND= ${.OBJDIR}/../libstand/libstand.a .endif +LIBSTAND= ${.OBJDIR}/../libstand/libstand.a + .if ${MK_ZFS} != "no" CFLAGS+= -DUSERBOOT_ZFS_SUPPORT LIBZFSBOOT= ${.OBJDIR}/../zfs/libzfsboot.a