Skip to content

Commit ae60e07

Browse files
brooniectmarinas
authored andcommitted
kselftest/arm64: Fix ABI header directory location
Currently the arm64 kselftests attempt to locate the ABI headers using custom logic which doesn't work correctly in the case of out of tree builds if KBUILD_OUTPUT is not specified. Since lib.mk defines KHDR_INCLUDES with the appropriate flags we can simply remove the custom logic and use that instead. Signed-off-by: Mark Brown <broonie@kernel.org> Link: https://lore.kernel.org/r/20220503231655.211346-1-broonie@kernel.org Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
1 parent aca43ad commit ae60e07

1 file changed

Lines changed: 1 addition & 10 deletions

File tree

tools/testing/selftests/arm64/Makefile

Lines changed: 1 addition & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -17,16 +17,7 @@ top_srcdir = $(realpath ../../../../)
1717
# Additional include paths needed by kselftest.h and local headers
1818
CFLAGS += -I$(top_srcdir)/tools/testing/selftests/
1919

20-
# Guessing where the Kernel headers could have been installed
21-
# depending on ENV config
22-
ifeq ($(KBUILD_OUTPUT),)
23-
khdr_dir = $(top_srcdir)/usr/include
24-
else
25-
# the KSFT preferred location when KBUILD_OUTPUT is set
26-
khdr_dir = $(KBUILD_OUTPUT)/kselftest/usr/include
27-
endif
28-
29-
CFLAGS += -I$(khdr_dir)
20+
CFLAGS += $(KHDR_INCLUDES)
3021

3122
export CFLAGS
3223
export top_srcdir

0 commit comments

Comments
 (0)