aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHauke Mehrtens <hauke@hauke-m.de>2020-11-07 15:20:16 +0100
committerHauke Mehrtens <hauke@hauke-m.de>2020-11-30 23:46:11 +0100
commit473fbe303f36b84c6653dd84ee302d1b70078479 (patch)
treec31f8bb7413faff7253df8e40d13a373b73e573e
parent27531fffbf99ff423f5bf9236a5d07d1ccdbf3e1 (diff)
downloadbackports-473fbe303f36b84c6653dd84ee302d1b70078479.tar.gz
backports: Extend NOSTDINC_FLAGS
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>
-rw-r--r--backport/Makefile.kernel4
1 files changed, 2 insertions, 2 deletions
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/ \