mirror of
https://git.hardenedbsd.org/hardenedbsd/HardenedBSD.git
synced 2024-11-21 18:50:50 +01:00
stand: Rename LIBFDT to LIBSAFDT
Preemptively address a collision with LIBFDT (to be added in the future) from src.libnames.mk, which gets included via bsd.progs.mk. No functional change intended. Reviewed by: imp MFC after: 1 week Sponsored by: Innovate UK Differential Revision: https://reviews.freebsd.org/D42486
This commit is contained in:
parent
b8dbfb0a6c
commit
b247ff70e8
@ -122,7 +122,7 @@ ${LOADER}.efi: ${PROG}
|
||||
|
||||
LIBEFI= ${BOOTOBJ}/efi/libefi/libefi.a
|
||||
|
||||
DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT}
|
||||
LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA}
|
||||
DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT}
|
||||
LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBSAFDT} ${LIBEFI_FDT} ${LIBSA}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -4,5 +4,5 @@ CFLAGS+= -I${FDTSRC}
|
||||
CFLAGS+= -I${BOOTOBJ}/fdt
|
||||
CFLAGS+= -I${SYSDIR}/contrib/libfdt
|
||||
CFLAGS+= -DLOADER_FDT_SUPPORT
|
||||
LIBFDT= ${BOOTOBJ}/fdt/libfdt.a
|
||||
LIBSAFDT= ${BOOTOBJ}/fdt/libfdt.a
|
||||
.endif
|
||||
|
@ -63,7 +63,7 @@ CFLAGS+= -I${.CURDIR} -I${.CURDIR}/arch/${MACHINE_ARCH}
|
||||
|
||||
CFLAGS+= -Wall
|
||||
|
||||
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
|
||||
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
@ -59,8 +59,8 @@ LDFLAGS+= -T ${.CURDIR}/ldscript.powerpc
|
||||
LIBOFW= ${BOOTOBJ}/libofw/libofw.a
|
||||
CFLAGS+= -I${BOOTSRC}/libofw
|
||||
|
||||
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBFDT} ${LIBSA}
|
||||
DPADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
|
||||
LDADD= ${LDR_INTERP} ${LIBOFW} ${LIBSAFDT} ${LIBSA}
|
||||
|
||||
MK_PIE= no
|
||||
|
||||
|
@ -78,7 +78,7 @@ OBJS+= ${SRCS:N*.h:R:S/$/.o/g}
|
||||
ubldr ubldr.bin ubldr.pie: ${OBJS}
|
||||
.endif
|
||||
|
||||
DPADD= ${LDR_INTERP} ${LIBFDT} ${LIBSA}
|
||||
LDADD= ${LDR_INTERP} ${LIBFDT} ${LIBSA}
|
||||
DPADD= ${LDR_INTERP} ${LIBSAFDT} ${LIBSA}
|
||||
LDADD= ${LDR_INTERP} ${LIBSAFDT} ${LIBSA}
|
||||
|
||||
.include <bsd.prog.mk>
|
||||
|
Loading…
Reference in New Issue
Block a user