diff options
| author | James Morris <james.morris@microsoft.com> | 2018-02-27 10:39:29 -0800 |
|---|---|---|
| committer | James Morris <james.morris@microsoft.com> | 2018-02-27 10:39:29 -0800 |
| commit | 757744eb5f47c4492dfc04155c2c2c325fbcb4fc (patch) | |
| tree | b1f7c2a8a353991e8693fec8cc5ad92c3ebd3dc6 /samples | |
| parent | 3be23274755ee85771270a23af7691dc9b3a95db (diff) | |
| parent | 6275ecbcd3ae3aaf47c3bc1e46343a50f16b2577 (diff) | |
| download | linux-stable-757744eb5f47c4492dfc04155c2c2c325fbcb4fc.tar.gz linux-stable-757744eb5f47c4492dfc04155c2c2c325fbcb4fc.tar.bz2 linux-stable-757744eb5f47c4492dfc04155c2c2c325fbcb4fc.zip | |
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."
Diffstat (limited to 'samples')
| -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 0e349b80686e..ba942e3ead89 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 |