summaryrefslogtreecommitdiffstats
path: root/sys
diff options
context:
space:
mode:
authornyan <nyan@FreeBSD.org>2014-09-28 13:34:43 +0000
committernyan <nyan@FreeBSD.org>2014-09-28 13:34:43 +0000
commit10fd7562c167e71c4b6a5c82a3361aa6c015963b (patch)
treec4e71543e09b39de8a40e6eb692cee838bc8c9f9 /sys
parentaa0a0308d2126a1c698f8ee9338276c0783beb04 (diff)
downloadFreeBSD-src-10fd7562c167e71c4b6a5c82a3361aa6c015963b.zip
FreeBSD-src-10fd7562c167e71c4b6a5c82a3361aa6c015963b.tar.gz
MFi386: r261567
Switch from lib/libstand to sys/boot/libstand32.
Diffstat (limited to 'sys')
-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 7ab13a1..4d865e7 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