Date: Sat, 2 Jan 2021 22:05:11 GMT From: Toomas Soome <tsoome@FreeBSD.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org Subject: git: a3479cfd2217 - main - loader: fix build on non-x86 platforms Message-ID: <202101022205.102M5BEE030241@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by tsoome: URL: https://cgit.FreeBSD.org/src/commit/?id=a3479cfd2217d133d49aa7159ea23faf901dc586 commit a3479cfd2217d133d49aa7159ea23faf901dc586 Author: Toomas Soome <tsoome@FreeBSD.org> AuthorDate: 2021-01-02 21:48:52 +0000 Commit: Toomas Soome <tsoome@FreeBSD.org> CommitDate: 2021-01-02 22:04:56 +0000 loader: fix build on non-x86 platforms Need to build pnglite with all. Reported by: Herbert J. Skuhra --- stand/loader.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/stand/loader.mk b/stand/loader.mk index 9ed8b65a2d06..cde7a31dca7e 100644 --- a/stand/loader.mk +++ b/stand/loader.mk @@ -6,17 +6,17 @@ CFLAGS+=-I${LDRSRC} SRCS+= boot.c commands.c console.c devopen.c interp.c SRCS+= interp_backslash.c interp_parse.c ls.c misc.c -SRCS+= module.c nvstore.c +SRCS+= module.c nvstore.c pnglite.c CFLAGS.module.c += -I$(SRCTOP)/sys/teken -I${SRCTOP}/contrib/pnglite -.if ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "amd64" -SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c -SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c -SRCS+= pnglite.c .PATH: ${SRCTOP}/contrib/pnglite CFLAGS.pnglite.c+= -I${SRCTOP}/contrib/pnglite CFLAGS.pnglite.c+= -DHAVE_MEMCPY -I${SRCTOP}/sys/contrib/zlib + +.if ${MACHINE} == "i386" || ${MACHINE_CPUARCH} == "amd64" +SRCS+= load_elf32.c load_elf32_obj.c reloc_elf32.c +SRCS+= load_elf64.c load_elf64_obj.c reloc_elf64.c .elif ${MACHINE_CPUARCH} == "aarch64" SRCS+= load_elf64.c reloc_elf64.c .elif ${MACHINE_CPUARCH} == "arm"
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202101022205.102M5BEE030241>