path: root/net/bpfilter
diff options
authorMasahiro Yamada <>2020-04-29 12:45:15 +0900
committerMasahiro Yamada <>2020-05-17 18:52:01 +0900
commit8a2cc0505cc4313e6ce2bc8fc1ce3607b410e114 (patch)
treeabef38449c4e91d31465aece7994e5f23319c540 /net/bpfilter
parent7f3a59db274c3e3d884c785e363a054110f1c266 (diff)
bpfilter: use 'userprogs' syntax to build bpfilter_umh
The user mode helper should be compiled for the same architecture as the kernel. This Makefile reused the 'hostprogs' syntax by overriding HOSTCC with CC. Use the new syntax 'userprogs' to fix the Makefile mess. Signed-off-by: Masahiro Yamada <> Acked-by: Sam Ravnborg <>
Diffstat (limited to 'net/bpfilter')
1 files changed, 4 insertions, 8 deletions
diff --git a/net/bpfilter/Makefile b/net/bpfilter/Makefile
index f6209e4827b9..f23b53294fba 100644
--- a/net/bpfilter/Makefile
+++ b/net/bpfilter/Makefile
@@ -3,18 +3,14 @@
# Makefile for the Linux BPFILTER layer.
-hostprogs := bpfilter_umh
+userprogs := bpfilter_umh
bpfilter_umh-objs := main.o
-KBUILD_HOSTCFLAGS += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi \
- $(filter -m32 -m64, $(KBUILD_CFLAGS))
-HOSTCC := $(CC)
+userccflags += -I $(srctree)/tools/include/ -I $(srctree)/tools/include/uapi
-# builtin bpfilter_umh should be compiled with -static
+# builtin bpfilter_umh should be linked with -static
# since rootfs isn't mounted at the time of __init
# function is called and do_execv won't find elf interpreter
-KBUILD_HOSTLDFLAGS += -static $(filter -m32 -m64, $(KBUILD_CFLAGS))
+userldflags += -static
$(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh