Merge tag 'seccomp-v4.16-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux into fixes-v4.16-rc4
- do not build samples when cross compiling (Michal Hocko) From Kees: "This disables the seccomp samples when cross compiling. We're seen too many build issues here, so it's best to just disable it, especially since they're just the samples."
This commit is contained in:
@@ -1,4 +1,5 @@
|
||||
# SPDX-License-Identifier: GPL-2.0
|
||||
ifndef CROSS_COMPILE
|
||||
hostprogs-$(CONFIG_SAMPLE_SECCOMP) := bpf-fancy dropper bpf-direct
|
||||
|
||||
HOSTCFLAGS_bpf-fancy.o += -I$(objtree)/usr/include
|
||||
@@ -16,7 +17,6 @@ HOSTCFLAGS_bpf-direct.o += -idirafter $(objtree)/include
|
||||
bpf-direct-objs := bpf-direct.o
|
||||
|
||||
# Try to match the kernel target.
|
||||
ifndef CROSS_COMPILE
|
||||
ifndef CONFIG_64BIT
|
||||
|
||||
# s390 has -m31 flag to build 31 bit binaries
|
||||
@@ -35,12 +35,4 @@ HOSTLOADLIBES_bpf-fancy += $(MFLAG)
|
||||
HOSTLOADLIBES_dropper += $(MFLAG)
|
||||
endif
|
||||
always := $(hostprogs-m)
|
||||
else
|
||||
# MIPS system calls are defined based on the -mabi that is passed
|
||||
# to the toolchain which may or may not be a valid option
|
||||
# for the host toolchain. So disable tests if target architecture
|
||||
# is MIPS but the host isn't.
|
||||
ifndef CONFIG_MIPS
|
||||
always := $(hostprogs-m)
|
||||
endif
|
||||
endif
|
||||
|
||||
Reference in New Issue
Block a user