diff mbox series

[03/30] backports: Extend NOSTDINC_FLAGS

Message ID 20201201220415.30582-4-hauke@hauke-m.de (mailing list archive)
State New, archived
Headers show
Series backports: Update to match kernel 5.10-rc6 | expand

Commit Message

Hauke Mehrtens Dec. 1, 2020, 10:03 p.m. UTC 
Instead of overwriting NOSTDINC_FLAGS our Makefile should extend
NOSTDINC_FLAGS. The kernel also sets some options in NOSTDINC_FLAGS and
we should not overwrite them.

Without this change backports included the stddef.h from the libc.

Signed-off-by: Hauke Mehrtens <hauke@hauke-m.de>
---
 backport/Makefile.kernel | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
diff mbox series

Patch

diff --git a/backport/Makefile.kernel b/backport/Makefile.kernel
index 5c966974..62baa945 100644
--- a/backport/Makefile.kernel
+++ b/backport/Makefile.kernel
@@ -4,7 +4,7 @@  ifeq ($(CONFIG_BACKPORT_INTEGRATE),)
 backport-cc-disable-warning = $(call try-run,\
 	$(CC) $(KBUILD_CPPFLAGS) $(KBUILD_CFLAGS) -W$(strip $(1)) -c -x c /dev/null -o "$$TMP",-Wno-$(strip $(1)))
 
-NOSTDINC_FLAGS := \
+NOSTDINC_FLAGS += \
 	-I$(M)/backport-include/ \
 	-I$(M)/backport-include/uapi \
 	-I$(M)/include/ \
@@ -21,7 +21,7 @@  export backport_srctree = $(M)
 else
 export BACKPORT_DIR = backports/
 export backport_srctree = $(BACKPORT_DIR)
-NOSTDINC_FLAGS := \
+NOSTDINC_FLAGS += \
 	-I$(BACKPORT_DIR)/backport-include/ \
 	-I$(BACKPORT_DIR)/backport-include/uapi \
 	-I$(BACKPORT_DIR)/include/ \