package/gnu-efi/0001-Allow-CFLAGS-CPPFLAGS-to-be-completed-from-the-envir.patch

   1 From eea0f62a1f6712f10afe47635b80a061505d2d2f Mon Sep 17 00:00:00 2001
   2 From: Romain Naour <romain.naour@openwide.fr>
   3 Date: Sat, 17 Jan 2015 18:33:37 +0100
   4 Subject: [PATCH 1/2] Allow CFLAGS/CPPFLAGS to be completed from the
   5  environment
   6
   7 Buildroot passes its own CPPFLAGS and CFLAGS in the environment, so
   8 the CFLAGS += and CPPFLAGS += statements in gnu-efi Makefile have no
   9 effect. Change these to override <VARIABLE> += so that they extend the
  10 flags passed by Buildroot.
  11
  12 [Romain:
  13  - rebase on top of 3.0.1 release]
  14
  15 Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
  16 Signed-off-by: Romain Naour <romain.naour@openwide.fr>
  17 ---
  18  Make.defaults | 16 ++++++++--------
  19  1 file changed, 8 insertions(+), 8 deletions(-)
  20
  21 diff --git a/Make.defaults b/Make.defaults
  22 index 169273d..b0ddea0 100644
  23 --- a/Make.defaults
  24 +++ b/Make.defaults
  25 @@ -80,14 +80,14 @@ endif
  26  #
  27
  28  # Arch-specific compilation flags
  29 -CPPFLAGS += -DCONFIG_$(ARCH)
  30 +override CPPFLAGS += -DCONFIG_$(ARCH)
  31
  32  ifeq ($(ARCH),ia64)
  33 -  CFLAGS += -mfixed-range=f32-f127
  34 +  override CFLAGS += -mfixed-range=f32-f127
  35  endif
  36
  37  ifeq ($(ARCH),ia32)
  38 -  CFLAGS += -mno-mmx -mno-sse
  39 +  override CFLAGS += -mno-mmx -mno-sse
  40    ifeq ($(HOSTARCH),x86_64)
  41      ARCH3264 = -m32
  42    endif
  43 @@ -103,10 +103,10 @@ ifeq ($(ARCH),x86_64)
  44                                   && [ $(GCCMINOR) -ge "7" ] ) ) \
  45                            && echo 1)
  46    ifeq ($(GCCNEWENOUGH),1)
  47 -    CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
  48 +    override CPPFLAGS += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
  49    endif
  50
  51 -  CFLAGS += -mno-red-zone -mno-mmx -mno-sse
  52 +  override CFLAGS += -mno-red-zone -mno-mmx -mno-sse
  53    ifeq ($(HOSTARCH),ia32)
  54      ARCH3264 = -m64
  55    endif
  56 @@ -127,7 +127,7 @@ export LIBGCC=$(shell $(CC) $(ARCH3264) -print-libgcc-file-name)
  57  endif
  58
  59  ifeq ($(ARCH),arm)
  60 -CFLAGS += -marm
  61 +override CFLAGS += -marm
  62  endif
  63
  64  # Generic compilation flags
  65 @@ -135,10 +135,10 @@ INCDIR  += -I$(SRCDIR) -I$(TOPDIR)/inc -I$(TOPDIR)/inc/$(ARCH) \
  66             -I$(TOPDIR)/inc/protocol
  67
  68  ifeq (FreeBSD, $(findstring FreeBSD, $(OS)))
  69 -CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
  70 +override CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
  71             -ffreestanding -fno-stack-protector
  72  else
  73 -CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
  74 +override CFLAGS  += $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing \
  75             -fno-merge-constants -ffreestanding -fno-stack-protector       \
  76             -fno-stack-check
  77  endif
  78 --
  79 1.9.3
  80