Commit 9395cd7c authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'landlock-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux 

Pull landlock fix from Mickaël Salaün:
 "Fix out-of-tree builds for Landlock tests"

* tag 'landlock-6.0-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux:
  selftests/landlock: Fix out-of-tree builds
parents a7b7751a a5254052

tools/testing/selftests/landlock/Makefile

+10 −9
Original line number Diff line number Diff line 
# SPDX-License-Identifier: GPL-2.0

#

# First run: make -C ../../../.. headers_install



CFLAGS += -Wall -O2 $(KHDR_INCLUDES)

LDLIBS += -lcap



LOCAL_HDRS += common.h



src_test := $(wildcard *_test.c)
@@ -8,14 +13,10 @@ TEST_GEN_PROGS := $(src_test:.c=) 


TEST_GEN_PROGS_EXTENDED := true



OVERRIDE_TARGETS := 1

top_srcdir := ../../../..

include ../lib.mk



khdr_dir = $(top_srcdir)/usr/include

# Static linking for short targets:

$(TEST_GEN_PROGS_EXTENDED): LDFLAGS += -static



$(OUTPUT)/true: true.c

	$(LINK.c) $< $(LDLIBS) -o $@ -static

include ../lib.mk



$(OUTPUT)/%_test: %_test.c $(khdr_dir)/linux/landlock.h ../kselftest_harness.h common.h

	$(LINK.c) $< $(LDLIBS) -o $@ -lcap -I$(khdr_dir)
 
# Static linking for targets with $(OUTPUT)/ prefix:

$(TEST_GEN_PROGS_EXTENDED): LDFLAGS += -static

tools/testing/selftests/lib.mk

+4 −0
Original line number Diff line number Diff line
@@ -42,6 +42,10 @@ endif 
selfdir = $(realpath $(dir $(filter %/lib.mk,$(MAKEFILE_LIST))))

top_srcdir = $(selfdir)/../../..



ifeq ($(KHDR_INCLUDES),)

KHDR_INCLUDES := -isystem $(top_srcdir)/usr/include

endif



# The following are built by lib.mk common compile rules.

# TEST_CUSTOM_PROGS should be used by tests that require

# custom build rule and prevent common build rule use.