Commit 4a6a6f5c authored Sep 26, 2019 by Shuah Khan Committed by Bartosz Golaszewski Oct 22, 2019

tools: gpio: Use !building_out_of_srctree to determine srctree



make TARGETS=gpio kselftest fails with:

Makefile:23: tools/build/Makefile.include: No such file or directory

When the gpio tool make is invoked from tools Makefile, srctree is
cleared and the current logic check for srctree equals to empty
string to determine srctree location from CURDIR.

When the build in invoked from selftests/gpio Makefile, the srctree
is set to "." and the same logic used for srctree equals to empty is
needed to determine srctree.

Check building_out_of_srctree undefined as the condition for both
cases to fix "make TARGETS=gpio kselftest" build failure.

Cc: stable@vger.kernel.org
Signed-off-by: Shuah Khan <skhan@linuxfoundation.org>
Signed-off-by: Bartosz Golaszewski <bgolaszewski@baylibre.com>

parent 7d194c21

tools/gpio/Makefile

+5 −1

Original line number	Diff line number	Diff line
		@@ -3,7 +3,11 @@ include ../scripts/Makefile.include

		bindir ?= /usr/bin

		ifeq ($(srctree),)
		# This will work when gpio is built in tools env. where srctree
		# isn't set and when invoked from selftests build, where srctree
		# is set to ".". building_out_of_srctree is undefined for in srctree
		# builds
		ifndef building_out_of_srctree
		srctree := $(patsubst %/,%,$(dir $(CURDIR)))
		srctree := $(patsubst %/,%,$(dir $(srctree)))
		endif

Admin message