diff options
| author | Paul Moore <pmoore2@cisco.com> | 2020-10-20 13:08:02 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2021-02-19 11:09:36 -0500 |
| commit | e5f7b252d87b9dce7d4685594b7d7a6c6421e11f (patch) | |
| tree | 547244f55cae08c6bde192c8df8e015b513ce429 | |
| parent | e6a7fc11a4d939870c9b2cee11ceb061a6737a21 (diff) | |
| download | efi-boot-shim-e5f7b252d87b9dce7d4685594b7d7a6c6421e11f.tar.gz efi-boot-shim-e5f7b252d87b9dce7d4685594b7d7a6c6421e11f.zip | |
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 <pmoore2@cisco.com>
| -rw-r--r-- | Make.defaults | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Make.defaults b/Make.defaults index e85e957b..1fa2bd5f 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 |