diff options
| author | Masahiro Yamada <masahiroy@kernel.org> | 2020-04-29 12:45:15 +0900 |
|---|---|---|
| committer | Masahiro Yamada <masahiroy@kernel.org> | 2020-05-17 18:52:01 +0900 |
| commit | 8a2cc0505cc4313e6ce2bc8fc1ce3607b410e114 (patch) | |
| tree | abef38449c4e91d31465aece7994e5f23319c540 | |
| parent | 7f3a59db274c3e3d884c785e363a054110f1c266 (diff) | |
| download | linux-stable-8a2cc0505cc4313e6ce2bc8fc1ce3607b410e114.tar.gz linux-stable-8a2cc0505cc4313e6ce2bc8fc1ce3607b410e114.tar.bz2 linux-stable-8a2cc0505cc4313e6ce2bc8fc1ce3607b410e114.zip | |
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 <masahiroy@kernel.org>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
| -rw-r--r-- | net/bpfilter/Makefile | 12 |
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 -ifeq ($(CONFIG_BPFILTER_UMH), y) -# 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)) -endif +userldflags += -static $(obj)/bpfilter_umh_blob.o: $(obj)/bpfilter_umh |