Commit 27d79a2b authored by Shuah Khan's avatar Shuah Khan
Browse files

selftests: fix bpf build/test workflow regression when KBUILD_OUTPUT is set



commit 8ce72dc3 ("selftests: fix headers_install circular dependency")
broke bpf build/test workflow. When KBUILD_OUTPUT is set, bpf objects end
up in KBUILD_OUTPUT build directory instead of in ../selftests/bpf.

The following bpf workflow breaks when it can't find the test_verifier:

cd tools/testing/selftests/bpf; make; ./test_verifier;

Fix it to set OUTPUT only when it is undefined in lib.mk. It didn't need
to be set in the first place.

Fixes: 8ce72dc3 ("selftests: fix headers_install circular dependency")
Reported-by: default avatarAlexei Starovoitov <alexei.starovoitov@gmail.com>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Acked-by: default avatarAlexei Starovoitov <ast@kernel.org>
Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
parent c3c59928
Loading
Loading
Loading
Loading
+3 −9
Original line number Diff line number Diff line
@@ -3,17 +3,11 @@
CC := $(CROSS_COMPILE)gcc

ifeq (0,$(MAKELEVEL))
    ifneq ($(O),)
	OUTPUT := $(O)
    else
	ifneq ($(KBUILD_OUTPUT),)
		OUTPUT := $(KBUILD_OUTPUT)
	else
    ifeq ($(OUTPUT),)
	OUTPUT := $(shell pwd)
	DEFAULT_INSTALL_HDR_PATH := 1
    endif
endif
endif
selfdir = $(realpath $(dir $(filter %/lib.mk,$(MAKEFILE_LIST))))

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