diff options
| author | Simon J. Gerraty <sjg@FreeBSD.org> | 2020-07-19 23:54:00 +0000 |
|---|---|---|
| committer | Simon J. Gerraty <sjg@FreeBSD.org> | 2020-07-19 23:54:00 +0000 |
| commit | e17f5b1d307b7b8910d67883e57a9604305906d5 (patch) | |
| tree | 5a9f9551abafa2e64f176c905f7d04c25772ae5e /stand | |
| parent | cf5cd89c3a93eb41213a0fe83be7ff79c3d9bb63 (diff) | |
| download | src-e17f5b1d307b7b8910d67883e57a9604305906d5.tar.gz src-e17f5b1d307b7b8910d67883e57a9604305906d5.zip | |
Oops missed Makefile.config
Notes
Notes:
svn path=/head/; revision=363350
Diffstat (limited to 'stand')
| -rw-r--r-- | stand/efi/loader/Makefile | 5 | ||||
| -rw-r--r-- | stand/i386/loader/Makefile | 10 |
2 files changed, 12 insertions, 3 deletions
diff --git a/stand/efi/loader/Makefile b/stand/efi/loader/Makefile index 73b1975ad3e3..fe08f5cc4289 100644 --- a/stand/efi/loader/Makefile +++ b/stand/efi/loader/Makefile @@ -102,3 +102,8 @@ DPADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} ${LDSCRIPT} LDADD= ${LDR_INTERP} ${LIBEFI} ${LIBFDT} ${LIBEFI_FDT} ${LIBSA} .include <bsd.prog.mk> + +PATH_BOOTABLE_TOKEN=/boot/boot.4th +CFLAGS+= ${XCFLAGS.${.TARGET:T:R}:U} +XCFLAGS.main+= -DPATH_BOOTABLE_TOKEN=\"${PATH_BOOTABLE_TOKEN}\" + diff --git a/stand/i386/loader/Makefile b/stand/i386/loader/Makefile index b74ef9007d97..b46129d5a2dd 100644 --- a/stand/i386/loader/Makefile +++ b/stand/i386/loader/Makefile @@ -1,5 +1,5 @@ # $FreeBSD$ - +.if 0 HAVE_ZFS= ${MK_LOADER_ZFS} LOADER_NET_SUPPORT?= yes @@ -11,6 +11,10 @@ LOADER_MSDOS_SUPPORT?= yes LOADER_UFS_SUPPORT?= yes LOADER_GZIP_SUPPORT?= yes LOADER_BZIP2_SUPPORT?= yes +.else +LOADER_NET_SUPPORT?= yes +LOADER_UFS_SUPPORT?= yes +.endif .include <bsd.init.mk> @@ -56,8 +60,8 @@ LIBI386= ${BOOTOBJ}/i386/libi386/libi386.a CFLAGS+= -I${BOOTSRC}/i386 # Debug me! -#CFLAGS+= -g -#LDFLAGS+= -g +CFLAGS+= -g +LDFLAGS+= -g ${LOADER}: ${LOADER}.bin ${BTXLDR} ${BTXKERN} btxld -v -f aout -e ${LOADER_ADDRESS} -o ${.TARGET} -l ${BTXLDR} \ |