diff options
| author | Peter Jones <pjones@redhat.com> | 2021-03-05 18:01:29 -0500 |
|---|---|---|
| committer | Jan Setje-Eilers <73182357+jsetje@users.noreply.github.com> | 2021-03-09 13:52:53 -0800 |
| commit | 4425a1bf8b60cc4a3a17f5ee98d0ee771447815d (patch) | |
| tree | bcf72b9b0897b25d4442bbe80e841676d17624ad | |
| parent | 7d5df1cebdbdc3ed11cde165a752cf358878aa8a (diff) | |
| download | efi-boot-shim-4425a1bf8b60cc4a3a17f5ee98d0ee771447815d.tar.gz efi-boot-shim-4425a1bf8b60cc4a3a17f5ee98d0ee771447815d.zip | |
More minor makefile cleanups
This patch does some makefile cleanups, to fix the parts that are
actually just bad that the previous patch left in for clarity:
- removes -fno-builtin . This flag is implied by -ffreestanding , which
we use everywhere.
- gets rid of the two places where ARM has their own -O flags for no
real reason. Note that this will make those use -Os instead of -O2.
- export VERBOSE and DEBUG if they're set.
Signed-off-by: Peter Jones <pjones@redhat.com>
| -rw-r--r-- | Cryptlib/OpenSSL/Makefile | 2 | ||||
| -rw-r--r-- | Make.defaults | 9 |
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 |