summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--sys/boot/ia64/ski/Makefile6
-rw-r--r--sys/boot/ia64/skiload/Makefile6
2 files changed, 10 insertions, 2 deletions
diff --git a/sys/boot/ia64/ski/Makefile b/sys/boot/ia64/ski/Makefile
index d3e6cf3..1ba911d 100644
--- a/sys/boot/ia64/ski/Makefile
+++ b/sys/boot/ia64/ski/Makefile
@@ -24,7 +24,11 @@ LIBFICL=
.endif
LIBSTAND= -lstand
+.if exists(${.OBJDIR}/../libski/libski.a)
+LIBSKI= ${.OBJDIR}/../libski/libski.a
+.else
LIBSKI= ${.CURDIR}/../libski/libski.a
+.endif
# Always add MI sources
.PATH: ${.CURDIR}/../../common
@@ -38,7 +42,7 @@ CFLAGS+= -I${.CURDIR}/../../.. -I.
CFLAGS+= -I${.CURDIR}/../libski
CFLAGS+= -DLOADER
-LDFLAGS= -nostdlib -T ldscript.ia64
+LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64
CLEANFILES+= vers.c vers.o ${PROG}.list
CLEANFILES+= loader.help
diff --git a/sys/boot/ia64/skiload/Makefile b/sys/boot/ia64/skiload/Makefile
index d3e6cf3..1ba911d 100644
--- a/sys/boot/ia64/skiload/Makefile
+++ b/sys/boot/ia64/skiload/Makefile
@@ -24,7 +24,11 @@ LIBFICL=
.endif
LIBSTAND= -lstand
+.if exists(${.OBJDIR}/../libski/libski.a)
+LIBSKI= ${.OBJDIR}/../libski/libski.a
+.else
LIBSKI= ${.CURDIR}/../libski/libski.a
+.endif
# Always add MI sources
.PATH: ${.CURDIR}/../../common
@@ -38,7 +42,7 @@ CFLAGS+= -I${.CURDIR}/../../.. -I.
CFLAGS+= -I${.CURDIR}/../libski
CFLAGS+= -DLOADER
-LDFLAGS= -nostdlib -T ldscript.ia64
+LDFLAGS= -nostdlib -T ${.CURDIR}/ldscript.ia64
CLEANFILES+= vers.c vers.o ${PROG}.list
CLEANFILES+= loader.help
OpenPOWER on IntegriCloud