Skip to content

Commit 13eb8c0

Browse files
HoyeonRheeKernel Patches Daemon
authored andcommitted
selftests/bpf: propagate LLVM toolchain into runqslower sub-make
The runqslower build invokes a nested make, but the selected LLVM toolchain (via LLVM=-<version>) is not propagated. This causes the sub-make to call the system-default 'clang' and 'llvm-strip' even when a specific LLVM version is intended. # LLVM=-20 V=1 make -C tools/testing/selftests/bpf ... make -C tools/bpf/runqslower ... clang -g -O2 --target=bpfel -I... -c runqslower.bpf.c -o runqslower.bpf.o && \ llvm-strip -g runqslower.bpf.o /bin/sh: 1: clang: not found (expected: clang-20 and llvm-strip-20) Propagate CLANG and LLVM_STRIP to the sub-make to ensure LLVM version consistency across all builds. Signed-off-by: Hoyeon Lee <[email protected]>
1 parent 2412df8 commit 13eb8c0

File tree

2 files changed

+2
-0
lines changed

2 files changed

+2
-0
lines changed

tools/testing/selftests/bpf/Makefile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -306,6 +306,7 @@ endif
306306

307307
$(OUTPUT)/runqslower: $(BPFOBJ) | $(DEFAULT_BPFTOOL) $(RUNQSLOWER_OUTPUT)
308308
$(Q)$(MAKE) $(submake_extras) -C $(TOOLSDIR)/bpf/runqslower \
309+
CLANG=$(CLANG) LLVM_STRIP=$(LLVM_STRIP) \
309310
OUTPUT=$(RUNQSLOWER_OUTPUT) VMLINUX_BTF=$(VMLINUX_BTF) \
310311
BPFTOOL_OUTPUT=$(HOST_BUILD_DIR)/bpftool/ \
311312
BPFOBJ_OUTPUT=$(BUILD_DIR)/libbpf/ \

tools/testing/selftests/lib.mk

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ LLVM_SUFFIX := $(LLVM)
88
endif
99

1010
CLANG := $(LLVM_PREFIX)clang$(LLVM_SUFFIX)
11+
LLVM_STRIP := $(LLVM_PREFIX)llvm-strip$(LLVM_SUFFIX)
1112

1213
CLANG_TARGET_FLAGS_arm := arm-linux-gnueabi
1314
CLANG_TARGET_FLAGS_arm64 := aarch64-linux-gnu

0 commit comments

Comments
 (0)