diff options
| author | Peter Jones <pjones@redhat.com> | 2013-05-29 17:56:45 +0800 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2013-09-26 11:58:01 -0400 |
| commit | 4a7f9bd4a687f1bca25e86644e53c5ca5ab2bac8 (patch) | |
| tree | 4cb68742d8c3372ba38c3808d850b8597ba59356 | |
| parent | c0f8cd721c9770b12824b77f607119d5a7c9ee0a (diff) | |
| download | efi-boot-shim-4a7f9bd4a687f1bca25e86644e53c5ca5ab2bac8.tar.gz efi-boot-shim-4a7f9bd4a687f1bca25e86644e53c5ca5ab2bac8.zip | |
Make EFI_PATH easily resettable from the build command line.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | lib/Makefile | 1 |
2 files changed, 2 insertions, 3 deletions
@@ -6,7 +6,7 @@ LIB_PATH = /usr/lib64 EFI_INCLUDE = /usr/include/efi EFI_INCLUDES = -nostdinc -ICryptlib -ICryptlib/Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -EFI_PATH = /usr/lib64/gnuefi +EFI_PATH := /usr/lib64/gnuefi LIB_GCC = $(shell $(CC) -print-libgcc-file-name) EFI_LIBS = -lefi -lgnuefi --start-group Cryptlib/libcryptlib.a Cryptlib/OpenSSL/libopenssl.a --end-group $(LIB_GCC) @@ -88,7 +88,7 @@ Cryptlib/OpenSSL/libopenssl.a: $(MAKE) -C Cryptlib/OpenSSL lib/lib.a: - $(MAKE) -C lib + $(MAKE) -C lib EFI_PATH=$(EFI_PATH) %.efi: %.so objcopy -j .text -j .sdata -j .data \ diff --git a/lib/Makefile b/lib/Makefile index be5f3542..43907005 100644 --- a/lib/Makefile +++ b/lib/Makefile @@ -6,7 +6,6 @@ ARCH = $(shell uname -m | sed s,i[3456789]86,ia32,) EFI_INCLUDE = /usr/include/efi EFI_INCLUDES = -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -I../include -EFI_PATH = /usr/lib64/gnuefi EFI_CRT_OBJS = $(EFI_PATH)/crt0-efi-$(ARCH).o EFI_LDS = $(EFI_PATH)/elf_$(ARCH)_efi.lds |