Commit 5d8401be authored by Linus Torvalds's avatar Linus Torvalds
Browse files

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

Pull landlock fix from Mickaël Salaün:
 "Fix the test build for some distros"

* tag 'landlock-6.1-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux:
  selftests/landlock: Build without static libraries
parents bd745027 091873e4

tools/testing/selftests/landlock/Makefile

+4 −3
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
# First run: make -C ../../../.. headers_install



CFLAGS += -Wall -O2 $(KHDR_INCLUDES)

LDLIBS += -lcap



LOCAL_HDRS += common.h
@@ -13,10 +12,12 @@ TEST_GEN_PROGS := $(src_test:.c=) 


TEST_GEN_PROGS_EXTENDED := true



# Static linking for short targets:

# Short targets:

$(TEST_GEN_PROGS): LDLIBS += -lcap

$(TEST_GEN_PROGS_EXTENDED): LDFLAGS += -static



include ../lib.mk



# Static linking for targets with $(OUTPUT)/ prefix:

# Targets with $(OUTPUT)/ prefix:

$(TEST_GEN_PROGS): LDLIBS += -lcap

$(TEST_GEN_PROGS_EXTENDED): LDFLAGS += -static