|
 |
4210fa |
From d3a8eedee05c8991117a8efb8bfa3fe606d6c2e9 Mon Sep 17 00:00:00 2001
|
|
|
4210fa |
From: Peter Jones <pjones@redhat.com>
|
|
|
4210fa |
Date: Wed, 25 Feb 2015 16:34:28 -0500
|
|
|
4210fa |
Subject: [PATCH 2/2] Make lib/ use the right CFLAGS.
|
|
|
4210fa |
|
|
|
4210fa |
Signed-off-by: Peter Jones <pjones@redhat.com>
|
|
|
4210fa |
---
|
|
|
4210fa |
Makefile | 4 ++--
|
|
|
4210fa |
lib/Makefile | 11 -----------
|
|
|
4210fa |
lib/console.c | 4 ++--
|
|
|
4210fa |
3 files changed, 4 insertions(+), 15 deletions(-)
|
|
|
4210fa |
|
|
|
4210fa |
diff --git a/Makefile b/Makefile
|
|
|
4210fa |
index 332a29b..532bcf3 100644
|
|
|
4210fa |
--- a/Makefile
|
|
|
4210fa |
+++ b/Makefile
|
|
|
4210fa |
@@ -9,7 +9,7 @@ SUBDIRS = Cryptlib lib
|
|
|
4210fa |
LIB_PATH = /usr/lib64
|
|
|
4210fa |
|
|
|
4210fa |
EFI_INCLUDE := /usr/include/efi
|
|
|
4210fa |
-EFI_INCLUDES = -nostdinc -ICryptlib -ICryptlib/Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -Iinclude
|
|
|
4210fa |
+EFI_INCLUDES = -nostdinc -ICryptlib -ICryptlib/Include -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -I$(shell pwd)/include
|
|
|
4210fa |
EFI_PATH := /usr/lib64/gnuefi
|
|
|
4210fa |
|
|
|
4210fa |
LIB_GCC = $(shell $(CC) -print-libgcc-file-name)
|
|
|
4210fa |
@@ -115,7 +115,7 @@ Cryptlib/OpenSSL/libopenssl.a:
|
|
|
4210fa |
$(MAKE) -C Cryptlib/OpenSSL
|
|
|
4210fa |
|
|
|
4210fa |
lib/lib.a:
|
|
|
4210fa |
- $(MAKE) -C lib
|
|
|
4210fa |
+ $(MAKE) CFLAGS="$(CFLAGS)" -C lib
|
|
|
4210fa |
|
|
|
4210fa |
ifeq ($(ARCH),aarch64)
|
|
|
4210fa |
FORMAT := -O binary
|
|
|
4210fa |
diff --git a/lib/Makefile b/lib/Makefile
|
|
|
4210fa |
index ebd21a1..d93a26d 100644
|
|
|
4210fa |
--- a/lib/Makefile
|
|
|
4210fa |
+++ b/lib/Makefile
|
|
|
4210fa |
@@ -4,17 +4,6 @@ LIBFILES = simple_file.o guid.o console.o execute.o configtable.o shell.o variab
|
|
|
4210fa |
|
|
|
4210fa |
EFI_INCLUDES = -I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol -I../include
|
|
|
4210fa |
|
|
|
4210fa |
-CFLAGS = -ggdb -O0 -fno-stack-protector -fno-strict-aliasing -fpic \
|
|
|
4210fa |
- -fshort-wchar -Wall -DBUILD_EFI -fno-builtin -Werror \
|
|
|
4210fa |
- $(EFI_INCLUDES)
|
|
|
4210fa |
-
|
|
|
4210fa |
-ifeq ($(ARCH),x86_64)
|
|
|
4210fa |
- CFLAGS += -mno-red-zone -DEFI_FUNCTION_WRAPPER -DGNU_EFI_USE_MS_ABI
|
|
|
4210fa |
-endif
|
|
|
4210fa |
-ifeq ($(ARCH),ia32)
|
|
|
4210fa |
- CFLAGS += -mno-red-zone -m32
|
|
|
4210fa |
-endif
|
|
|
4210fa |
-
|
|
|
4210fa |
lib.a: $(LIBFILES)
|
|
|
4210fa |
ar rcs lib.a $(LIBFILES)
|
|
|
4210fa |
|
|
|
4210fa |
diff --git a/lib/console.c b/lib/console.c
|
|
|
4210fa |
index 10bc154..e70ab48 100644
|
|
|
4210fa |
--- a/lib/console.c
|
|
|
4210fa |
+++ b/lib/console.c
|
|
|
4210fa |
@@ -4,8 +4,8 @@
|
|
|
4210fa |
*
|
|
|
4210fa |
* see COPYING file
|
|
|
4210fa |
*/
|
|
|
4210fa |
-#include <efi/efi.h>
|
|
|
4210fa |
-#include <efi/efilib.h>
|
|
|
4210fa |
+#include <efi.h>
|
|
|
4210fa |
+#include <efilib.h>
|
|
|
4210fa |
|
|
|
4210fa |
#include <console.h>
|
|
|
4210fa |
#include <variables.h>
|
|
|
4210fa |
--
|
|
|
4210fa |
2.1.0
|
|
|
4210fa |
|