]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
selftests/bpf: Adapt OUTPUT appending logic to lower versions of Make
authorPu Lehui <pulehui@huawei.com>
Thu, 5 Sep 2024 08:13:52 +0000 (08:13 +0000)
committerAlexei Starovoitov <ast@kernel.org>
Thu, 5 Sep 2024 20:13:39 +0000 (13:13 -0700)
The $(let ...) function is only supported by GNU Make version 4.4 [0]
and above, otherwise the following exception file or directory will be
generated:

tools/testing/selftests/bpfFEATURE-DUMP.selftests
tools/testing/selftests/bpffeature/

Considering that the GNU Make version of most Linux distributions is
lower than 4.4, let us adapt the corresponding logic to it.

Link: https://lists.gnu.org/archive/html/info-gnu/2022-10/msg00008.html
Acked-by: Eduard Zingerman <eddyz87@gmail.com>
Signed-off-by: Pu Lehui <pulehui@huawei.com>
Link: https://lore.kernel.org/r/20240905081401.1894789-2-pulehui@huaweicloud.com
Signed-off-by: Alexei Starovoitov <ast@kernel.org>
tools/testing/selftests/bpf/Makefile

index 7660d19b66c2afde49275f5baec441085c0cb8fe..9905e3739dd01d795a906f2fbbc0434066fc3fd2 100644 (file)
@@ -187,8 +187,14 @@ FEATURE_TESTS := llvm
 FEATURE_DISPLAY := $(FEATURE_TESTS)
 
 # Makefile.feature expects OUTPUT to end with a slash
+ifeq ($(shell expr $(MAKE_VERSION) \>= 4.4), 1)
 $(let OUTPUT,$(OUTPUT)/,\
        $(eval include ../../../build/Makefile.feature))
+else
+OUTPUT := $(OUTPUT)/
+$(eval include ../../../build/Makefile.feature)
+OUTPUT := $(patsubst %/,%,$(OUTPUT))
+endif
 endif
 
 ifeq ($(feature-llvm),1)