Index: sys/boot/arm/uboot/Makefile =================================================================== --- sys/boot/arm/uboot/Makefile +++ sys/boot/arm/uboot/Makefile @@ -114,6 +114,7 @@ # where to get libstand from CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ +LIBSTAND= ${OBJTOP}/lib/libstand/libstand.a CFLAGS+= -fPIC @@ -121,7 +122,7 @@ 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} Index: sys/boot/efi/boot1/Makefile =================================================================== --- sys/boot/efi/boot1/Makefile +++ sys/boot/efi/boot1/Makefile @@ -90,8 +90,9 @@ # __aeabi_* (arm) or __divdi3 (i386). # as well as required string and memory functions for all platforms. # +LIBSTAND= ${OBJTOP}/lib/libstand/libstand.a DPADD+= ${LIBEFI} ${LIBSTAND} -LDADD+= ${LIBEFI} -lstand +LDADD+= ${LIBEFI} ${LIBSTAND} DPADD+= ${LDSCRIPT} Index: sys/boot/efi/loader/Makefile =================================================================== --- sys/boot/efi/loader/Makefile +++ sys/boot/efi/loader/Makefile @@ -149,7 +149,7 @@ --output-target=${EFI_TARGET} ${.ALLSRC} ${.TARGET} LIBEFI= ${.OBJDIR}/../libefi/libefi.a - +LIBSTAND= ${OBJTOP}/lib/libstand/libstand.a DPADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSTAND} \ ${LDSCRIPT} LDADD= ${LIBFICL} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSTAND} Index: sys/boot/sparc64/loader/Makefile =================================================================== --- sys/boot/sparc64/loader/Makefile +++ sys/boot/sparc64/loader/Makefile @@ -81,12 +81,13 @@ # where to get libstand from CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/ +LIBSTAND= ${OBJTOP}/lib/libstand/libstand.a # Need sys/ for crypto/intake.h 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} | \