diff options
author | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:22:00 +0100 |
---|---|---|
committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2019-01-28 08:22:00 +0100 |
commit | 83b21ed0fc2a7b17c6b9d4f72f664841f797380b (patch) | |
tree | 99272c0f69b8d762bf82400e6bdb84146b5baadb /tools/testing/selftests/seccomp/Makefile | |
parent | sysrq: Remove duplicated sysrq message (diff) | |
parent | Linux 5.0-rc4 (diff) | |
download | linux-83b21ed0fc2a7b17c6b9d4f72f664841f797380b.tar.xz linux-83b21ed0fc2a7b17c6b9d4f72f664841f797380b.zip |
Merge 5.0-rc4 into tty-next
We need the tty and serial fixes in here as well.
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'tools/testing/selftests/seccomp/Makefile')
-rw-r--r-- | tools/testing/selftests/seccomp/Makefile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/testing/selftests/seccomp/Makefile b/tools/testing/selftests/seccomp/Makefile index fce7f4ce0692..1760b3e39730 100644 --- a/tools/testing/selftests/seccomp/Makefile +++ b/tools/testing/selftests/seccomp/Makefile @@ -9,7 +9,7 @@ BINARIES := seccomp_bpf seccomp_benchmark CFLAGS += -Wl,-no-as-needed -Wall seccomp_bpf: seccomp_bpf.c ../kselftest_harness.h - $(CC) $(CFLAGS) $(LDFLAGS) -lpthread $< -o $@ + $(CC) $(CFLAGS) $(LDFLAGS) $< -lpthread -o $@ TEST_PROGS += $(BINARIES) EXTRA_CLEAN := $(BINARIES) |