From owner-svn-src-head@freebsd.org  Mon Oct  9 22:11:59 2017
Return-Path: <owner-svn-src-head@freebsd.org>
Delivered-To: svn-src-head@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 74C3EE3D95B;
 Mon,  9 Oct 2017 22:11:59 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::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 31571821CA;
 Mon,  9 Oct 2017 22:11:59 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id v99MBwEw010910;
 Mon, 9 Oct 2017 22:11:58 GMT (envelope-from imp@FreeBSD.org)
Received: (from imp@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v99MBwCq010906;
 Mon, 9 Oct 2017 22:11:58 GMT (envelope-from imp@FreeBSD.org)
Message-Id: <201710092211.v99MBwCq010906@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: imp set sender to imp@FreeBSD.org
 using -f
From: Warner Losh <imp@FreeBSD.org>
Date: Mon, 9 Oct 2017 22:11:58 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-head@freebsd.org
Subject: svn commit: r324449 - in head/sys/boot: arm/uboot efi/boot1
 sparc64/loader
X-SVN-Group: head
X-SVN-Commit-Author: imp
X-SVN-Commit-Paths: in head/sys/boot: arm/uboot efi/boot1 sparc64/loader
X-SVN-Commit-Revision: 324449
X-SVN-Commit-Repository: base
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.23
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
 <svn-src-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head/>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-head>,
 <mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 09 Oct 2017 22:11:59 -0000

Author: imp
Date: Mon Oct  9 22:11:57 2017
New Revision: 324449
URL: https://svnweb.freebsd.org/changeset/base/324449

Log:
  Prefer ${LIBSTAND} to -lstand
  
  Sponsored by: Netflix

Modified:
  head/sys/boot/arm/uboot/Makefile
  head/sys/boot/efi/boot1/Makefile
  head/sys/boot/sparc64/loader/Makefile

Modified: head/sys/boot/arm/uboot/Makefile
==============================================================================
--- head/sys/boot/arm/uboot/Makefile	Mon Oct  9 21:06:16 2017	(r324448)
+++ head/sys/boot/arm/uboot/Makefile	Mon Oct  9 22:11:57 2017	(r324449)
@@ -121,7 +121,7 @@ CFLAGS+=	-fPIC
 NO_WERROR.clang=
 
 DPADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSTAND}
-LDADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} -lstand
+LDADD=		${LIBFICL} ${LIBUBOOT} ${LIBFDT} ${LIBUBOOT_FDT} ${LIBSTAND}
 
 OBJS+=  ${SRCS:N*.h:R:S/$/.o/g}
 

Modified: head/sys/boot/efi/boot1/Makefile
==============================================================================
--- head/sys/boot/efi/boot1/Makefile	Mon Oct  9 21:06:16 2017	(r324448)
+++ head/sys/boot/efi/boot1/Makefile	Mon Oct  9 22:11:57 2017	(r324449)
@@ -91,7 +91,7 @@ LIBEFI=		${.OBJDIR}/../libefi/libefi.a
 # as well as required string and memory functions for all platforms.
 #
 DPADD+=		${LIBEFI} ${LIBSTAND}
-LDADD+=		${LIBEFI} -lstand
+LDADD+=		${LIBEFI} ${LIBSTAND}
 
 DPADD+=		${LDSCRIPT}
 

Modified: head/sys/boot/sparc64/loader/Makefile
==============================================================================
--- head/sys/boot/sparc64/loader/Makefile	Mon Oct  9 21:06:16 2017	(r324448)
+++ head/sys/boot/sparc64/loader/Makefile	Mon Oct  9 22:11:57 2017	(r324449)
@@ -86,7 +86,7 @@ CFLAGS+=	-I${.CURDIR}/../../../../lib/libstand/
 CFLAGS+=	-I${SRCTOP}/sys
 
 DPADD=		${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} ${LIBSTAND}
-LDADD=		${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} -lstand
+LDADD=		${LIBFICL} ${LIBZFSBOOT} ${LIBOFW} ${LIBSTAND}
 
 loader.help: help.common help.sparc64
 	cat ${.ALLSRC} | \