mirror of
https://git.proxmox.com/git/efi-boot-shim
synced 2025-08-06 03:02:37 +00:00
Make lib/ use the right CFLAGS.
Signed-off-by: Peter Jones <pjones@redhat.com>
This commit is contained in:
parent
7fdbd9d48a
commit
605be9f179
4
Makefile
4
Makefile
@ -9,7 +9,7 @@ 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 -Iinclude
|
||||
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)
|
||||
@ -115,7 +115,7 @@ Cryptlib/OpenSSL/libopenssl.a:
|
||||
$(MAKE) -C Cryptlib/OpenSSL
|
||||
|
||||
lib/lib.a:
|
||||
$(MAKE) -C lib
|
||||
$(MAKE) CFLAGS="$(CFLAGS)" -C lib
|
||||
|
||||
ifeq ($(ARCH),aarch64)
|
||||
FORMAT := -O binary
|
||||
|
11
lib/Makefile
11
lib/Makefile
@ -4,17 +4,6 @@ LIBFILES = simple_file.o guid.o console.o execute.o configtable.o shell.o variab
|
||||
|
||||
EFI_INCLUDES = -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -I../include
|
||||
|
||||
CFLAGS = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic -nostdinc\
|
||||
-fshort-wchar -Wall -DBUILD_EFI -fno-builtin -Werror \
|
||||
$(EFI_INCLUDES)
|
||||
|
||||
ifeq ($(ARCH),x86_64)
|
||||
CFLAGS += -mno-red-zone -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI
|
||||
endif
|
||||
ifeq ($(ARCH),ia32)
|
||||
CFLAGS += -mno-red-zone -m32
|
||||
endif
|
||||
|
||||
lib.a: $(LIBFILES)
|
||||
ar rcs lib.a $(LIBFILES)
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user