svn commit: r307955 - in head/sys/boot/i386: gptboot gptzfsboot

Warner Losh imp at FreeBSD.org
Wed Oct 26 05:27:01 UTC 2016


Author: imp
Date: Wed Oct 26 05:26:59 2016
New Revision: 307955
URL: https://svnweb.freebsd.org/changeset/base/307955

Log:
  LIBSTAND goes last, so put it last here too.

Modified:
  head/sys/boot/i386/gptboot/Makefile
  head/sys/boot/i386/gptzfsboot/Makefile

Modified: head/sys/boot/i386/gptboot/Makefile
==============================================================================
--- head/sys/boot/i386/gptboot/Makefile	Wed Oct 26 05:26:58 2016	(r307954)
+++ head/sys/boot/i386/gptboot/Makefile	Wed Oct 26 05:26:59 2016	(r307955)
@@ -75,7 +75,7 @@ gptboot.bin: gptboot.out
 	${OBJCOPY} -S -O binary gptboot.out ${.TARGET}
 
 gptboot.out: ${BTXCRT} gptboot.o sio.o crc32.o drv.o cons.o util.o ${OPENCRYPTO_XTS}
-	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} ${LIBGELIBOOT}
+	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBGELIBOOT} ${LIBSTAND}
 
 gptboot.o: ${.CURDIR}/../../common/ufsread.c
 

Modified: head/sys/boot/i386/gptzfsboot/Makefile
==============================================================================
--- head/sys/boot/i386/gptzfsboot/Makefile	Wed Oct 26 05:26:58 2016	(r307954)
+++ head/sys/boot/i386/gptzfsboot/Makefile	Wed Oct 26 05:26:59 2016	(r307955)
@@ -78,7 +78,7 @@ gptzfsboot.bin: gptzfsboot.out
 
 gptzfsboot.out: ${BTXCRT} zfsboot.o sio.o gpt.o drv.o cons.o util.o \
 	skein.o skein_block.o ${OPENCRYPTO_XTS}
-	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBSTAND} ${LIBGELIBOOT}
+	${LD} ${LD_FLAGS} -Ttext ${ORG2} -o ${.TARGET} ${.ALLSRC} ${LIBGELIBOOT} ${LIBSTAND}
 
 zfsboot.o: ${.CURDIR}/../../zfs/zfsimpl.c
 


More information about the svn-src-all mailing list