summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2014-11-03 11:08:00 +0000
committernyan <nyan@FreeBSD.org>2014-11-03 11:08:00 +0000
commit027712baa4498cccfa3a260efa95856e66deaccb (patch)
tree16e05809f5fa6940882bb7b06448827a7b3e45b5 /sys/boot
parent85b0a199370cc03e5e3b70c60606f3dc58b6a959 (diff)
downloadFreeBSD-src-027712baa4498cccfa3a260efa95856e66deaccb.zip
FreeBSD-src-027712baa4498cccfa3a260efa95856e66deaccb.tar.gz
MFC: r272256
Switch from lib/libstand to sys/boot/libstand32.
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/Makefile.pc983
-rw-r--r--sys/boot/pc98/loader/Makefile2
2 files changed, 3 insertions, 2 deletions
diff --git a/sys/boot/Makefile.pc98 b/sys/boot/Makefile.pc98
index aa989e1..8468399 100644
--- a/sys/boot/Makefile.pc98
+++ b/sys/boot/Makefile.pc98
@@ -1,4 +1,3 @@
# $FreeBSD$
-# Blank, to override Makefile.i386 since Makefile.$MACHINE is included before
-# Makefile.$MACHINE_ARCH
+SUBDIR+= libstand32
diff --git a/sys/boot/pc98/loader/Makefile b/sys/boot/pc98/loader/Makefile
index 489eeac..bf559d4 100644
--- a/sys/boot/pc98/loader/Makefile
+++ b/sys/boot/pc98/loader/Makefile
@@ -56,6 +56,8 @@ LDFLAGS= -static -Ttext 0x0
LIBPC98= ${.OBJDIR}/../libpc98/libpc98.a
CFLAGS+= -I${.CURDIR}/..
+LIBSTAND= ${.OBJDIR}/../../libstand32/libstand.a
+
# BTX components
CFLAGS+= -I${.CURDIR}/../btx/lib
OpenPOWER on IntegriCloud