diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-27 14:02:39 -0800 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2018-02-27 14:02:39 -0800 |
commit | f3afe530d644488a074291da04a69a296ab63046 (patch) | |
tree | 1d4ae11a9ecbc9f65aba2f98a6ef2ba215298af4 | |
parent | b3d962605c0f552c72f7a8f62548227700f77ae8 (diff) | |
parent | 757744eb5f47c4492dfc04155c2c2c325fbcb4fc (diff) | |
download | linux-f3afe530d644488a074291da04a69a296ab63046.tar.gz |
Merge branch 'fixes-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-securityHEADmaster
Pull seccomp fix from James Morris:
"This disables the seccomp samples when cross compiling.
We've seen too many build issues here, so it's best to just disable
it, especially since they're just the samples"
* 'fixes-v4.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security:
samples/seccomp: do not compile when cross compiled
-rw-r--r-- | samples/seccomp/Makefile | 10 |
1 files changed, 1 insertions, 9 deletions
diff --git a/samples/seccomp/Makefile b/samples/seccomp/Makefile index 0e349b80686e7..ba942e3ead890 100644 --- a/samples/seccomp/Makefile +++ b/samples/seccomp/Makefile @@ -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 |