summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Cryptlib/OpenSSL/Makefile2
-rw-r--r--Make.defaults9
2 files changed, 7 insertions, 4 deletions
diff --git a/Cryptlib/OpenSSL/Makefile b/Cryptlib/OpenSSL/Makefile
index 6ff58e47..5bd72481 100644
--- a/Cryptlib/OpenSSL/Makefile
+++ b/Cryptlib/OpenSSL/Makefile
@@ -38,11 +38,9 @@ FEATUREFLAGS += -m32 -mno-mmx -mno-sse -mno-red-zone -nostdinc $(CLANG_BUGS)
DEFINES += -DMDE_CPU_IA32
endif
ifeq ($(ARCH),aarch64)
-OPTIMIZATIONS += -O2
DEFINES += -DMDE_CPU_AARCH64
endif
ifeq ($(ARCH),arm)
-OPTIMIZATIONS += -O2
DEFINES += -DMDE_CPU_ARM
endif
diff --git a/Make.defaults b/Make.defaults
index 7f1b8015..13393496 100644
--- a/Make.defaults
+++ b/Make.defaults
@@ -104,11 +104,9 @@ INCLUDES = -nostdinc \
-I$(EFI_INCLUDE) -I$(EFI_INCLUDE)/$(ARCH) -I$(EFI_INCLUDE)/protocol \
-I$(TOPDIR)/include -iquote $(TOPDIR) -iquote $(shell pwd)
-
override DEFAULT_FEATUREFLAGS = \
-std=gnu89 \
-ggdb \
- -fno-builtin \
-ffreestanding \
-fmacro-prefix-map='$(TOPDIR)/=$(DEBUGSRC)' \
-fno-stack-protector \
@@ -181,3 +179,10 @@ DEFINES += -DVENDOR_DBX_FILE=\"$(VENDOR_DBX_FILE)\"
endif
LDFLAGS = --hash-style=sysv -nostdlib -znocombreloc -T $(EFI_LDS) -shared -Bsymbolic -L$(EFI_PATH) -L$(LIBDIR) -LCryptlib -LCryptlib/OpenSSL $(EFI_CRT_OBJS) --build-id=sha1 $(ARCH_LDFLAGS) --no-undefined
+
+ifneq ($(DEBUG),)
+export DEBUG
+endif
+ifneq ($(VERBOSE),)
+export VERBOSE
+endif