Date: Mon, 9 Oct 2017 22:11:58 +0000 (UTC) From: Warner Losh <imp@FreeBSD.org> 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 Message-ID: <201710092211.v99MBwCq010906@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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} | \
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201710092211.v99MBwCq010906>