diff options
| author | Jakub Czapiga <jacz@semihalf.com> | 2021-08-26 14:35:10 +0200 |
|---|---|---|
| committer | Patrick Georgi <pgeorgi@google.com> | 2021-09-01 19:34:20 +0000 |
| commit | c35659d930d038da714c22d1a8157c67aa9ae69f (patch) | |
| tree | 682468ff1f16cd1423ed635e6f7503cec092e3a5 | |
| parent | b8461aab5271dcabf4663e6e7123f657f52cb4f2 (diff) | |
libpayload: Move EXTRA_CFLAGS to enable option override
Before this patch EXTRA_CFLAGS were placed before many other options.
This made overriding impossible even, when necessary. This patch moves
EXTRA_CFLAGS to be placed after original CFLAGS, thus making option
overriding possible.
Signed-off-by: Jakub Czapiga <jacz@semihalf.com>
Change-Id: If8394b151696eee4bd736d2fb1ad340209e05fbb
Reviewed-on: https://review.coreboot.org/c/coreboot/+/57181
Reviewed-by: Paul Fagerburg <pfagerburg@chromium.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
| -rw-r--r-- | payloads/libpayload/Makefile | 2 | ||||
| -rw-r--r-- | payloads/libpayload/Makefile.inc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/payloads/libpayload/Makefile b/payloads/libpayload/Makefile index 049b9837e2..90f6b23836 100644 --- a/payloads/libpayload/Makefile +++ b/payloads/libpayload/Makefile @@ -265,7 +265,7 @@ ifn$(EMPTY)def $(1)-objs_$(2)_template de$(EMPTY)fine $(1)-objs_$(2)_template $(obj)/$$(1).$(1).o: $$(1).$(2) $(obj)/libpayload-config.h $(4) @printf " CC $$$$(subst $$$$(obj)/,,$$$$(@))\n" - $(CC) $(3) -MMD $$$$(CFLAGS) -c -o $$$$@ $$$$< + $(CC) $(3) -MMD $$$$(CFLAGS) $(EXTRA_CFLAGS) -c -o $$$$@ $$$$< en$(EMPTY)def end$(EMPTY)if endef diff --git a/payloads/libpayload/Makefile.inc b/payloads/libpayload/Makefile.inc index fc679dd27e..a67ba77b67 100644 --- a/payloads/libpayload/Makefile.inc +++ b/payloads/libpayload/Makefile.inc @@ -58,7 +58,7 @@ subdirs-$(CONFIG_LP_LZ4) += liblz4 INCLUDES := -Iinclude -Iinclude/$(ARCHDIR-y) -I$(obj) INCLUDES += -include include/kconfig.h -include include/compiler.h -CFLAGS += $(EXTRA_CFLAGS) $(INCLUDES) -Os -pipe -nostdinc -ggdb3 +CFLAGS += $(INCLUDES) -Os -pipe -nostdinc -ggdb3 CFLAGS += -nostdlib -fno-builtin -ffreestanding -fomit-frame-pointer CFLAGS += -ffunction-sections -fdata-sections CFLAGS += -Wall -Wundef -Wstrict-prototypes -Wmissing-prototypes -Wvla |