diff options
| author | Shuah Khan <skhan@linuxfoundation.org> | 2019-09-26 19:16:41 -0600 |
|---|---|---|
| committer | Bartosz Golaszewski <bgolaszewski@baylibre.com> | 2019-10-22 14:42:42 +0200 |
| commit | 4a6a6f5c4aeedb72db871d60bfcca89835f317aa (patch) | |
| tree | 1c673a8a0a4c40754df2eebe6257c34229aaad83 /tools | |
| parent | 7d194c2100ad2a6dded545887d02754948ca5241 (diff) | |
| download | linux-4a6a6f5c4aeedb72db871d60bfcca89835f317aa.tar.gz linux-4a6a6f5c4aeedb72db871d60bfcca89835f317aa.tar.bz2 linux-4a6a6f5c4aeedb72db871d60bfcca89835f317aa.zip | |
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>
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/gpio/Makefile | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/tools/gpio/Makefile b/tools/gpio/Makefile index 6ecdd1067826..1178d302757e 100644 --- a/tools/gpio/Makefile +++ b/tools/gpio/Makefile @@ -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 |