diff options
| author | peter <peter@FreeBSD.org> | 2002-04-06 04:29:36 +0000 |
|---|---|---|
| committer | peter <peter@FreeBSD.org> | 2002-04-06 04:29:36 +0000 |
| commit | 8eb1fab9daacb4dfd928651273bee3b45bb04755 (patch) | |
| tree | a2fc1086f88a051a99c751fb1fe388b0da038d11 /sys/boot | |
| parent | bc98e7be03a77a17ca7d997fd2d339487b77d5ee (diff) | |
| download | FreeBSD-src-8eb1fab9daacb4dfd928651273bee3b45bb04755.zip FreeBSD-src-8eb1fab9daacb4dfd928651273bee3b45bb04755.tar.gz | |
Try and tidy up some very loose ends with paths to various libraries etc.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/efi/Makefile.inc | 5 | ||||
| -rw-r--r-- | sys/boot/efi/loader/Makefile | 18 | ||||
| -rw-r--r-- | sys/boot/ia64/efi/Makefile | 18 |
3 files changed, 30 insertions, 11 deletions
diff --git a/sys/boot/efi/Makefile.inc b/sys/boot/efi/Makefile.inc index d36cdb7..4985d7c 100644 --- a/sys/boot/efi/Makefile.inc +++ b/sys/boot/efi/Makefile.inc @@ -1,9 +1,4 @@ # $FreeBSD$ # Options used when building app-specific efi components - -DPADD+= ${DESTDIR}/${LIBDIR}/libstand.a -LIBSTANDDIR= ${.CURDIR}/../../../../lib/libstand -LIBSTAND= -lstand -LIBEFI= ${.OBJDIR}/../libefi/libefi.a CFLAGS+= -ffreestanding diff --git a/sys/boot/efi/loader/Makefile b/sys/boot/efi/loader/Makefile index 379af58..66415a7 100644 --- a/sys/boot/efi/loader/Makefile +++ b/sys/boot/efi/loader/Makefile @@ -23,6 +23,19 @@ LIBFICL= ${.CURDIR}/../../ficl/libficl.a LIBFICL= .endif +# where to get libstand from +.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a) +LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a +.else +LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a +.endif + +.if exists(${.OBJDIR}/../libefi/libefi.a) +LIBEFI= ${.OBJDIR}/../libefi/libefi.a +.else +LIBEFI= ${.CURDIR}/../libefi/libefi.a +.endif + # Always add MI sources .PATH: ${.CURDIR}/../../common .include <${.CURDIR}/../../common/Makefile.inc> @@ -85,9 +98,8 @@ machine: .include <bsd.prog.mk> -${BASE}.sym: ${OBJS} ${LIBEFI} ${CRT} vers.o +${BASE}.sym: ${OBJS} ${LIBFICL} ${LIBEFI} ${LIBSTAND} ${CRT} vers.o ${LD} ${LDFLAGS} -o ${BASE}.sym -M ${CRT} ${OBJS} vers.o \ - ${LIBFICL} ${LIBEFI} -L${DESTDIR}${LIBDIR} ${LIBSTAND} \ - > ${.OBJDIR}/${BASE}.list + ${LIBFICL} ${LIBEFI} ${LIBSTAND} > ${.OBJDIR}/${BASE}.list beforedepend ${OBJS}: machine diff --git a/sys/boot/ia64/efi/Makefile b/sys/boot/ia64/efi/Makefile index 379af58..66415a7 100644 --- a/sys/boot/ia64/efi/Makefile +++ b/sys/boot/ia64/efi/Makefile @@ -23,6 +23,19 @@ LIBFICL= ${.CURDIR}/../../ficl/libficl.a LIBFICL= .endif +# where to get libstand from +.if exists(${.OBJDIR}/../../../../lib/libstand/libstand.a) +LIBSTAND= ${.OBJDIR}/../../../../lib/libstand/libstand.a +.else +LIBSTAND= ${.CURDIR}/../../../../lib/libstand/libstand.a +.endif + +.if exists(${.OBJDIR}/../libefi/libefi.a) +LIBEFI= ${.OBJDIR}/../libefi/libefi.a +.else +LIBEFI= ${.CURDIR}/../libefi/libefi.a +.endif + # Always add MI sources .PATH: ${.CURDIR}/../../common .include <${.CURDIR}/../../common/Makefile.inc> @@ -85,9 +98,8 @@ machine: .include <bsd.prog.mk> -${BASE}.sym: ${OBJS} ${LIBEFI} ${CRT} vers.o +${BASE}.sym: ${OBJS} ${LIBFICL} ${LIBEFI} ${LIBSTAND} ${CRT} vers.o ${LD} ${LDFLAGS} -o ${BASE}.sym -M ${CRT} ${OBJS} vers.o \ - ${LIBFICL} ${LIBEFI} -L${DESTDIR}${LIBDIR} ${LIBSTAND} \ - > ${.OBJDIR}/${BASE}.list + ${LIBFICL} ${LIBEFI} ${LIBSTAND} > ${.OBJDIR}/${BASE}.list beforedepend ${OBJS}: machine |
