diff options
| author | Peter Jones <pjones@redhat.com> | 2015-04-13 19:55:25 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@redhat.com> | 2015-04-13 19:55:25 -0400 |
| commit | 344b9cbd0b92cacc8d4dcaf28a9d9e59fa3192da (patch) | |
| tree | 1404b0fdaa7dedd59041bbd9f673e4a6e6b6e2fa | |
| parent | 1f23ecc3000b14c02cbaf47a819ed89ac93ec12e (diff) | |
| download | efi-boot-shim-344b9cbd0b92cacc8d4dcaf28a9d9e59fa3192da.tar.gz efi-boot-shim-344b9cbd0b92cacc8d4dcaf28a9d9e59fa3192da.zip | |
Make lib/ use the right CFLAGS.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | Makefile | 4 | ||||
| -rw-r--r-- | lib/Makefile | 11 |
2 files changed, 2 insertions, 13 deletions
@@ -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 diff --git a/lib/Makefile b/lib/Makefile index 3c5101ef..d93a26de 100644 --- a/lib/Makefile +++ b/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) |