Commit caa4237a authored by Anton Protopopov's avatar Anton Protopopov Committed by Alexei Starovoitov
Browse files

selftests/bpf: Fix selection of static vs. dynamic LLVM 



The Makefile uses the exit code of the `llvm-config --link-static --libs`
command to choose between statically-linked and dynamically-linked LLVMs.
The stdout and stderr of that command are redirected to /dev/null.
To redirect the output the "&>" construction is used, which might not be
supported by /bin/sh, which is executed by make for $(shell ...) commands.
On such systems the test will fail even if static LLVM is actually
supported. Replace "&>" by ">/dev/null 2>&1" to fix this.

Fixes: 2a9d30fa ("selftests/bpf: Support dynamically linking LLVM if static is not available")
Signed-off-by: default avatarAnton Protopopov <aspsk@isovalent.com>
Signed-off-by: default avatarAndrii Nakryiko <andrii@kernel.org>
Acked-by: default avatarDaniel Xu <dxu@dxuuu.xyz>
Link: https://lore.kernel.org/bpf/20250310145112.1261241-1-aspsk@isovalent.com


Signed-off-by: default avatarAlexei Starovoitov <ast@kernel.org>
parent 488a8544

tools/testing/selftests/bpf/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -180,7 +180,7 @@ ifeq ($(feature-llvm),1) 
  # both llvm-config and lib.mk add -D_GNU_SOURCE, which ends up as conflict

  LLVM_CFLAGS  += $(filter-out -D_GNU_SOURCE,$(shell $(LLVM_CONFIG) --cflags))

  # Prefer linking statically if it's available, otherwise fallback to shared

  ifeq ($(shell $(LLVM_CONFIG) --link-static --libs &> /dev/null && echo static),static)

  ifeq ($(shell $(LLVM_CONFIG) --link-static --libs >/dev/null 2>&1 && echo static),static)

    LLVM_LDLIBS  += $(shell $(LLVM_CONFIG) --link-static --libs $(LLVM_CONFIG_LIB_COMPONENTS))

    LLVM_LDLIBS  += $(shell $(LLVM_CONFIG) --link-static --system-libs $(LLVM_CONFIG_LIB_COMPONENTS))

    LLVM_LDLIBS  += -lstdc++