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.
Unified · Split
| @@ -86,10 +86,10 @@ override LDFLAGS = · 85 unmodified lines | |||
| 86 | endif | 86 | endif |
| 87 | 87 | ||
| 88 | ifneq ($(O),) | 88 | ifneq ($(O),) |
| 89 | BUILD := $(abs_objtree) | 89 | BUILD := $(O) |
| 90 | else | 90 | else |
| 91 | ifneq ($(KBUILD_OUTPUT),) | 91 | ifneq ($(KBUILD_OUTPUT),) |
| 92 | BUILD := $(abs_objtree)/kselftest | 92 | BUILD := $(KBUILD_OUTPUT)/kselftest |
| 93 | else | 93 | else |
| 94 | BUILD := $(shell pwd) | 94 | BUILD := $(shell pwd) |
| 95 | DEFAULT_INSTALL_HDR_PATH := 1 | 95 | DEFAULT_INSTALL_HDR_PATH := 1 |
| @@ -102,7 +102,6 @@ include $(top_srcdir)/scripts/subarch.include · 6 unmodified lines | |||
| 102 | ARCH ?= $(SUBARCH) | 102 | ARCH ?= $(SUBARCH) |
| 103 | export KSFT_KHDR_INSTALL_DONE := 1 | 103 | export KSFT_KHDR_INSTALL_DONE := 1 |
| 104 | export BUILD | 104 | export BUILD |
| 105 | #$(info abd_objtree = $(abs_objtree) BUILD = $(BUILD)) | ||
| 106 | 105 | ||
| 107 | # build and run gpio when output directory is the src dir. | 106 | # build and run gpio when output directory is the src dir. |
| 108 | # gpio has dependency on tools/gpio and builds tools/gpio | 107 | # gpio has dependency on tools/gpio and builds tools/gpio |