diff options
| author | Peter Jones <pjones@redhat.com> | 2016-04-12 13:24:08 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2016-09-06 14:39:15 -0400 |
| commit | 6cbcfb727e1d42127e782e57f8b79268b9b2cff8 (patch) | |
| tree | 01a3ac25043b4fb2272fd213b6d5a0e78ccc7335 | |
| parent | edc16fdb82d400a764d44c941e8cfeff92399cbd (diff) | |
| download | efi-boot-shim-6cbcfb727e1d42127e782e57f8b79268b9b2cff8.tar.gz efi-boot-shim-6cbcfb727e1d42127e782e57f8b79268b9b2cff8.zip | |
Make LIB_PATH and EFI_PATH per-arch.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | Makefile | 10 |
1 files changed, 7 insertions, 3 deletions
@@ -13,11 +13,8 @@ OBJCOPY_GTE224 = $(shell expr `$(OBJCOPY) --version |grep ^"GNU objcopy" | sed SUBDIRS = Cryptlib lib -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 -I$(shell pwd)/include -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) @@ -51,6 +48,9 @@ ifeq ($(ARCH),x86_64) MMNAME = mmx64 FBNAME = fbx64 SHIMNAME= shimx64 + EFI_PATH:=/usr/lib64/gnuefi + LIB_PATH:=/usr/lib64 + endif ifeq ($(ARCH),ia32) CFLAGS += -mno-mmx -mno-sse -mno-red-zone -nostdinc \ @@ -60,6 +60,8 @@ ifeq ($(ARCH),ia32) MMNAME = mmia32 FBNAME = fbia32 SHIMNAME= shimia32 + EFI_PATH:=/usr/lib/gnuefi + LIB_PATH:=/usr/lib endif ifeq ($(ARCH),aarch64) CFLAGS += "-DEFI_ARCH=L\"aa64\"" \ @@ -67,6 +69,8 @@ ifeq ($(ARCH),aarch64) MMNAME = mmaa64 FBNAME = fbaa64 SHIMNAME= shimaa64 + EFI_PATH:=/usr/lib64/gnuefi + LIB_PATH:=/usr/lib64 endif ifneq ($(origin VENDOR_CERT_FILE), undefined) |