From aa2ad0329bc179f121142371680c14ef0cd9644e Mon Sep 17 00:00:00 2001 From: Callum Farmer Date: Tue, 24 Sep 2024 14:24:03 +0100 Subject: [PATCH] Fix calling of gnuefi install with local lds * Local lds wasn't being installed on RISC-V Signed-off-by: Callum Farmer --- gnuefi/Makefile | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/gnuefi/Makefile b/gnuefi/Makefile index 8911274..405439b 100644 --- a/gnuefi/Makefile +++ b/gnuefi/Makefile @@ -112,18 +112,13 @@ clean: install: mkdir -p $(INSTALLROOT)$(LIBDIR) $(INSTALL) -m 644 $(TARGETS) $(INSTALLROOT)$(LIBDIR) -ifeq ($(USING_FREEBSD),1) - ifeq ($(ARCH),x86_64) +ifneq (,$(filter $(ARCH),x86_64 ia32)) $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_fbsd_efi.lds $(INSTALLROOT)$(LIBDIR) - else - ifneq (,$(filter $(ARCH),aarch64 riscv64 ia32)) - $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi_local.lds $(INSTALLROOT)$(LIBDIR) - endif - $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR) - endif -else - $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR) endif +ifneq (,$(filter $(ARCH),aarch64 riscv64 ia32)) + $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi_local.lds $(INSTALLROOT)$(LIBDIR) +endif + $(INSTALL) -m 644 $(SRCDIR)/elf_$(ARCH)_efi.lds $(INSTALLROOT)$(LIBDIR) $(INSTALL) -d $(INSTALLROOT)$(PKGCONFIGDIR) $(INSTALL) -m 644 gnu-efi.pc $(INSTALLROOT)$(PKGCONFIGDIR)