From 13ac2e8b3f54a409ade2ca9b2746e776140e1dce Mon Sep 17 00:00:00 2001 From: Soop Date: Mon, 18 Mar 2024 13:09:11 +0000 Subject: [PATCH] Make apps link against the local gnuefi and crt objects Signed-off-by: Richard Hughes --- apps/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/Makefile b/apps/Makefile index 424ee9d..c4c3853 100644 --- a/apps/Makefile +++ b/apps/Makefile @@ -46,14 +46,14 @@ CDIR=$(TOPDIR)/.. LINUX_HEADERS = /usr/src/sys/build APPSDIR = $(LIBDIR)/gnuefi/apps CPPFLAGS += -D__KERNEL__ -I$(LINUX_HEADERS)/include -CRTOBJS = ../gnuefi/crt0-efi-$(ARCH).o +CRTOBJS = $(TOPDIR)/$(ARCH)/gnuefi/crt0-efi-$(ARCH).o LDSCRIPT = $(TOPDIR)/gnuefi/elf_$(ARCH)_efi.lds ifneq (,$(findstring FreeBSD,$(OS))) LDSCRIPT = $(TOPDIR)/gnuefi/elf_$(ARCH)_fbsd_efi.lds endif -LDFLAGS += -shared -Bsymbolic -L../lib -L../gnuefi $(CRTOBJS) +LDFLAGS += -shared -Bsymbolic -L$(TOPDIR)/$(ARCH)/lib -L$(TOPDIR)/$(ARCH)/gnuefi $(CRTOBJS) LOADLIBES += -lefi -lgnuefi LOADLIBES += $(LIBGCC)