From e5f7b252d87b9dce7d4685594b7d7a6c6421e11f Mon Sep 17 00:00:00 2001 From: Paul Moore Date: Tue, 20 Oct 2020 13:08:02 -0400 Subject: [PATCH] build: add some basic $EFI_PATH checking Not all distributions put the crt0-efi-$(ARCH).o file under $LIB_DIR/gnuefi, some stash it directly in $LIB_DIR. In an effort to make the build a bit more user friendly, check if $LIB_DIR/gnuefi exits before setting $EFI_PATH to that value; if $LIB_DIR/gnuefi does not exist, fallback to $LIB_DIR for $EFI_PATH. Signed-off-by: Paul Moore --- Make.defaults | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Make.defaults b/Make.defaults index e85e957..1fa2bd5 100644 --- a/Make.defaults +++ b/Make.defaults @@ -111,7 +111,7 @@ endif LIB_GCC = $(shell $(CC) $(ARCH_CFLAGS) -print-libgcc-file-name) EFI_LIBS = -lefi -lgnuefi --start-group Cryptlib/libcryptlib.a Cryptlib/OpenSSL/libopenssl.a --end-group $(LIB_GCC) FORMAT ?= --target efi-app-$(ARCH) -EFI_PATH ?= $(LIBDIR)/gnuefi +EFI_PATH ?= $(shell [ -d $(LIBDIR)/gnuefi ] && echo "$(LIBDIR)/gnuefi" || echo "$(LIBDIR)") MMSTEM ?= mm$(ARCH_SUFFIX) MMNAME = $(MMSTEM).efi