Define LIBFICL32 to be libficl.a on i386 and libficl32.a on amd64.
Sponsored by: Netflix
This commit is contained in:
parent
268e2d82c4
commit
7e3b76ca57
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=325479
@ -25,8 +25,12 @@ BINDIR?= /boot
|
||||
# NB: The makefiles depend on these being empty when we don't build forth.
|
||||
.if ${MK_FORTH} != "no"
|
||||
LIBFICL= ${BOOTOBJ}/ficl/libficl.a
|
||||
.if ${MACHINE} == "i386"
|
||||
LIBFICL32= ${LIBFICL}
|
||||
.else
|
||||
LIBFICL32= ${BOOTOBJ}/ficl32/libficl.a
|
||||
.endif
|
||||
.endif
|
||||
LIBSA= ${BOOTOBJ}/libsa/libsa.a
|
||||
.if ${MACHINE} == "i386"
|
||||
LIBSA32= ${LIBSA}
|
||||
|
@ -101,15 +101,8 @@ FILES+= loader.rc menu.rc
|
||||
# XXX crt0.o needs to be first for pxeboot(8) to work
|
||||
OBJS= ${BTXCRT}
|
||||
|
||||
# XXX not happy with this construct, revisit
|
||||
.if ${MACHINE_CPUARCH} == "amd64"
|
||||
FICL= ${LIBFICL32}
|
||||
.else
|
||||
FICL= ${LIBFICL}
|
||||
.endif
|
||||
|
||||
DPADD= ${FICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
|
||||
LDADD= ${FICL} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
|
||||
DPADD= ${LIBFICL32} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
|
||||
LDADD= ${LIBFICL32} ${LIBFIREWIRE} ${LIBZFSBOOT} ${LIBI386} ${LIBGELIBOOT} ${LIBSA32}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user