diff options
| author | marcel <marcel@FreeBSD.org> | 2002-03-28 06:52:10 +0000 |
|---|---|---|
| committer | marcel <marcel@FreeBSD.org> | 2002-03-28 06:52:10 +0000 |
| commit | 4131d9a1324a36e5eac0ec0c4fe4f84e396e909b (patch) | |
| tree | 936fc199c3fa623254715d031311c9e542ac8d27 /sys/boot | |
| parent | a7bb84b1a2933064ef2636dbccbd8606778e2b4b (diff) | |
| download | FreeBSD-src-4131d9a1324a36e5eac0ec0c4fe4f84e396e909b.zip FreeBSD-src-4131d9a1324a36e5eac0ec0c4fe4f84e396e909b.tar.gz | |
Duplicate the logic used elsewhere to define LIBSTAND.
Diffstat (limited to 'sys/boot')
| -rw-r--r-- | sys/boot/ia64/ski/Makefile | 13 | ||||
| -rw-r--r-- | sys/boot/ia64/skiload/Makefile | 13 |
2 files changed, 22 insertions, 4 deletions
diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile index 71447ba..4776228 100644 --- a/sys/boot/ia64/ski/Makefile +++ b/sys/boot/ia64/ski/Makefile @@ -23,7 +23,16 @@ LIBFICL= ${.CURDIR}/../../ficl/libficl.a LIBFICL= .endif -LIBSTAND= -lstand +# 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 +.endif +.endif + .if exists(${.OBJDIR}/../libski/libski.a) LIBSKI= ${.OBJDIR}/../libski/libski.a .else @@ -75,7 +84,7 @@ start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S machine: ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine -${PROG}: ${OBJS} ${LIBFICL} ${LIBSTAND} ${LIBSKI} vers.o +${PROG}: ${OBJS} ${LIBFICL} ${LIBSKI} vers.o ${LD} ${LDFLAGS} -o ${PROG} -M \ ${OBJS} vers.o \ ${LIBFICL} ${LIBSTAND} ${LIBSKI} ${LIBSTAND} \ diff --git a/sys/boot/ia64/skiload/Makefile b/sys/boot/ia64/skiload/Makefile index 71447ba..4776228 100644 --- a/sys/boot/ia64/skiload/Makefile +++ b/sys/boot/ia64/skiload/Makefile @@ -23,7 +23,16 @@ LIBFICL= ${.CURDIR}/../../ficl/libficl.a LIBFICL= .endif -LIBSTAND= -lstand +# 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 +.endif +.endif + .if exists(${.OBJDIR}/../libski/libski.a) LIBSKI= ${.OBJDIR}/../libski/libski.a .else @@ -75,7 +84,7 @@ start.o: ${.CURDIR}/../libefi/arch/${MACHINE_ARCH}/start.S machine: ln -sf ${.CURDIR}/../../../${MACHINE_ARCH}/include machine -${PROG}: ${OBJS} ${LIBFICL} ${LIBSTAND} ${LIBSKI} vers.o +${PROG}: ${OBJS} ${LIBFICL} ${LIBSKI} vers.o ${LD} ${LDFLAGS} -o ${PROG} -M \ ${OBJS} vers.o \ ${LIBFICL} ${LIBSTAND} ${LIBSKI} ${LIBSTAND} \ |
