mirror of
https://git.proxmox.com/git/efi-boot-shim
synced 2025-08-13 23:28:38 +00:00
allow 32-bit compilation with 64-bit compiler
Also removed unused LIB_PATH from some Makefiles. Change-Id: I7d28d18f7531b51b6121a2ffb88bcaedec57c467 Signed-off-by: Andrew Boie <andrew.p.boie@intel.com>
This commit is contained in:
parent
476d376ed0
commit
9712a7e77d
@ -1,7 +1,5 @@
|
||||
ARCH = $(shell uname -m | sed s,i[3456789]86,ia32,)
|
||||
|
||||
LIB_PATH = /usr/lib64
|
||||
|
||||
EFI_INCLUDE = /usr/include/efi
|
||||
EFI_INCLUDES = -nostdinc -IInclude -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol
|
||||
EFI_PATH = /usr/lib64/gnuefi
|
||||
@ -14,6 +12,9 @@ CFLAGS = -ggdb -O0 -I. -fno-stack-protector -fno-strict-aliasing -fpic -fshort-
|
||||
ifeq ($(ARCH),x86_64)
|
||||
CFLAGS += -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI
|
||||
endif
|
||||
ifeq ($(ARCH),ia32)
|
||||
CFLAGS += -m32
|
||||
endif
|
||||
LDFLAGS = -nostdlib -znocombreloc
|
||||
|
||||
TARGET = libcryptlib.a
|
||||
|
@ -1,7 +1,5 @@
|
||||
ARCH = $(shell uname -m | sed s,i[3456789]86,ia32,)
|
||||
|
||||
LIB_PATH = /usr/lib64
|
||||
|
||||
EFI_INCLUDE = /usr/include/efi
|
||||
EFI_INCLUDES = -I../Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol
|
||||
EFI_PATH = /usr/lib64/gnuefi
|
||||
@ -15,7 +13,7 @@ ifeq ($(ARCH),x86_64)
|
||||
CFLAGS += -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI -DSIXTY_FOUR_BIT_LONG
|
||||
endif
|
||||
ifeq ($(ARCH),ia32)
|
||||
CFLAGS += -DTHIRTY_TWO_BIT
|
||||
CFLAGS += -m32 -DTHIRTY_TWO_BIT
|
||||
endif
|
||||
LDFLAGS = -nostdlib -znocombreloc
|
||||
|
||||
|
3
Makefile
3
Makefile
@ -28,6 +28,9 @@ endif
|
||||
ifeq ($(ARCH),x86_64)
|
||||
CFLAGS += -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI
|
||||
endif
|
||||
ifeq ($(ARCH),ia32)
|
||||
CFLAGS += -m32
|
||||
endif
|
||||
ifneq ($(origin VENDOR_CERT_FILE), undefined)
|
||||
CFLAGS += -DVENDOR_CERT_FILE=\"$(VENDOR_CERT_FILE)\"
|
||||
endif
|
||||
|
@ -17,6 +17,9 @@ CFLAGS = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \
|
||||
ifeq ($(ARCH),x86_64)
|
||||
CFLAGS += -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI
|
||||
endif
|
||||
ifeq ($(ARCH),ia32)
|
||||
CFLAGS += -m32
|
||||
endif
|
||||
|
||||
lib.a: $(LIBFILES)
|
||||
ar rcs lib.a $(LIBFILES)
|
||||
|
Loading…
Reference in New Issue
Block a user