summaryrefslogtreecommitdiffstats
path: root/sys/boot
diff options
context:
space:
mode:
authorimp <imp@FreeBSD.org>2000-09-08 04:26:55 +0000
committerimp <imp@FreeBSD.org>2000-09-08 04:26:55 +0000
commit9795d67faf9fcd609f4b25ad8ede736bebfe4278 (patch)
tree17bb6308df3a940b459c78a5d231b461478f9c38 /sys/boot
parentead12b3bec85b29b88014619f9ba6484e9f3bcb0 (diff)
downloadFreeBSD-src-9795d67faf9fcd609f4b25ad8ede736bebfe4278.zip
FreeBSD-src-9795d67faf9fcd609f4b25ad8ede736bebfe4278.tar.gz
Look for libstand in the built tree rather than in /usr/lib. This
likely could be done better, but the tree is broken and I wanted to get a fix into the tree. Reviewed by: msmith
Diffstat (limited to 'sys/boot')
-rw-r--r--sys/boot/i386/loader/Makefile8
1 files changed, 7 insertions, 1 deletions
diff --git a/sys/boot/i386/loader/Makefile b/sys/boot/i386/loader/Makefile
index fe78fb9..b70281b 100644
--- a/sys/boot/i386/loader/Makefile
+++ b/sys/boot/i386/loader/Makefile
@@ -45,8 +45,14 @@ LIBI386= ${.OBJDIR}/../libi386/libi386.a
CFLAGS+= -I${.CURDIR}/..
# where to get libstand from
+#XXX need a better way to do this
+LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
+.if !exists(${LIBSTAND})
+LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a
+.if !exists(${LIBSTAND})
LIBSTAND= -lstand
-#LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a
+.endif
+.endif
CFLAGS+= -I${.CURDIR}/../../../../lib/libstand/
# BTX components
OpenPOWER on IntegriCloud