diff options
| author | Shuah Khan <skhan@linuxfoundation.org> | 2019-11-28 16:03:21 -0700 |
|---|---|---|
| committer | Shuah Khan <skhan@linuxfoundation.org> | 2019-11-28 16:27:44 -0700 |
| commit | f60b85e83659b5fbd3eb2c8f68d33ef4e35ebb2c (patch) | |
| tree | 2bc01df57f59d230f6777bf3eeced737f5554976 /tools | |
| parent | ed2d8fa734e7759ac3788a19f308d3243d0eb164 (diff) | |
| download | linux-f60b85e83659b5fbd3eb2c8f68d33ef4e35ebb2c.tar.gz | |
Revert "selftests: Fix O= and KBUILD_OUTPUT handling for relative paths"
This reverts commit 303e6218ecec475d5bc3e5922dec770ee5baf107.
This patch breaks several CI use-cases that run kselftest builds
without using main Makefile. This fix depends on abs_objtree which
is undefined when kselftest build is invoked on selftests Makefile
without going through the main Makefile.
Revert this for now as this patch impacts selftest runs.
Fixes: 303e6218ecec ("selftests: Fix O= and KBUILD_OUTPUT handling for relative paths")
Reported-by: Cristian Marussi <cristian.marussi@arm.com>
Reported-by: Michael Ellerman <mpe@ellerman.id.au>
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/testing/selftests/Makefile | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/tools/testing/selftests/Makefile b/tools/testing/selftests/Makefile index 6e762c42d758..503a93afd452 100644 --- a/tools/testing/selftests/Makefile +++ b/tools/testing/selftests/Makefile @@ -86,10 +86,10 @@ override LDFLAGS = endif ifneq ($(O),) - BUILD := $(abs_objtree) + BUILD := $(O) else ifneq ($(KBUILD_OUTPUT),) - BUILD := $(abs_objtree)/kselftest + BUILD := $(KBUILD_OUTPUT)/kselftest else BUILD := $(shell pwd) DEFAULT_INSTALL_HDR_PATH := 1 @@ -102,7 +102,6 @@ include $(top_srcdir)/scripts/subarch.include ARCH ?= $(SUBARCH) export KSFT_KHDR_INSTALL_DONE := 1 export BUILD -#$(info abd_objtree = $(abs_objtree) BUILD = $(BUILD)) # build and run gpio when output directory is the src dir. # gpio has dependency on tools/gpio and builds tools/gpio |