summaryrefslogtreecommitdiffstats
path: root/sys/boot/i386
diff options
context:
space:
mode:
authormsmith <msmith@FreeBSD.org>1998-09-19 01:35:53 +0000
committermsmith <msmith@FreeBSD.org>1998-09-19 01:35:53 +0000
commit0a0d8ce99ac15fd4a5b6dbccd3f2c715ee55b5dd (patch)
tree782400115f3cb6ec8d69cbc89fc9bef04a35d499 /sys/boot/i386
parent0523a3e013232e4d28e9bbc66002c2a171ff382b (diff)
downloadFreeBSD-src-0a0d8ce99ac15fd4a5b6dbccd3f2c715ee55b5dd.zip
FreeBSD-src-0a0d8ce99ac15fd4a5b6dbccd3f2c715ee55b5dd.tar.gz
Make libstand movable.
This completes the basic work required to make the loader work with BTX. We now have a third-stage bootstrap shared by the i386 and Alpha.
Diffstat (limited to 'sys/boot/i386')
-rw-r--r--sys/boot/i386/loader/Makefile12
1 files changed, 7 insertions, 5 deletions
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index 9ea3cf0..7c40a44 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -1,5 +1,4 @@
-# $Id: Makefile,v 1.3 1998/09/17 23:52:15 msmith Exp $
-# from $NetBSD: Makefile,v 1.12 1998/02/19 14:18:36 drochner Exp $
+# $Id: Makefile,v 1.4 1998/09/18 02:03:29 msmith Exp $
BASE= loader
PROG= ${BASE}
@@ -26,12 +25,15 @@ CLEANFILES+= vers.c vers.o ${BASE}.list setdef0.o setdef1.o setdefs.h \
CFLAGS+= -Wall
LDFLAGS= -nostdlib -static -Ttext 0x1000
-LDADD= -lstand ${LIBI386}
# i386 standalone support library
LIBI386= ${.OBJDIR}/../libi386/libi386.a
CFLAGS+= -I${.CURDIR}/..
+# where to get libstand from
+LIBSTAND= -lstand
+#LIBSTAND= ${.CURDIR}/../../../lib/libstand/libstand.a
+
# BTX components
BTXDIR= ${.CURDIR}/../btx
BTXLDR= ${BTXDIR}/btxldr/btxldr
@@ -51,8 +53,8 @@ ${BASE}: ${BASE}.bin ${BTXLDR} ${BTXKERN}
${BASE}.bin
${BASE}.bin: ${OBJS} ${LIBI386} vers.o setdef0.o setdef1.o
- ${LD} ${LDFLAGS} -o ${.TARGET} ${BTXCRT} setdef0.o ${OBJS} vers.o \
- setdef1.o -lstand ${LIBI386} -lstand
+ ${LD} ${LDFLAGS} -o ${.TARGET} ${BTXCRT} setdef0.o ${OBJS} vers.o setdef1.o \
+ ${LIBSTAND} ${LIBI386} ${LIBSTAND}
setdef0.o: setdefs.h
OpenPOWER on IntegriCloud