Commit 55d554f5 authored by Shuah Khan's avatar Shuah Khan Committed by Daniel Borkmann
Browse files

tools: bpf: Use !building_out_of_srctree to determine srctree 



make TARGETS=bpf kselftest fails with:

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

When the bpf 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/bpf 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=bpf kselftest" build failure.

Signed-off-by: default avatarShuah Khan <skhan@linuxfoundation.org>
Signed-off-by: default avatarDaniel Borkmann <daniel@iogearbox.net>
Acked-by: default avatarSong Liu <songliubraving@fb.com>
Link: https://lore.kernel.org/bpf/20190927011344.4695-1-skhan@linuxfoundation.org
parent 02dc96ef

tools/bpf/Makefile

+5 −1
Original line number Original line Diff line number Diff line
@@ -12,7 +12,11 @@ INSTALL ?= install 
CFLAGS += -Wall -O2

CFLAGS += -Wall -O2

CFLAGS += -D__EXPORTED_HEADERS__ -I$(srctree)/include/uapi -I$(srctree)/include

CFLAGS += -D__EXPORTED_HEADERS__ -I$(srctree)/include/uapi -I$(srctree)/include





ifeq ($(srctree),)

# This will work when bpf 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 $(CURDIR)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

endif

endif

tools/lib/bpf/Makefile

+5 −1
Original line number Original line Diff line number Diff line
@@ -8,7 +8,11 @@ LIBBPF_MAJOR_VERSION := $(firstword $(subst ., ,$(LIBBPF_VERSION))) 




MAKEFLAGS += --no-print-directory

MAKEFLAGS += --no-print-directory





ifeq ($(srctree),)

# This will work when bpf is built in tools env. where srctree

# isn't set and when invoked from selftests build, where srctree

# is a ".". building_out_of_srctree is undefined for in srctree

# builds

ifndef building_out_of_srctree

srctree := $(patsubst %/,%,$(dir $(CURDIR)))

srctree := $(patsubst %/,%,$(dir $(CURDIR)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

srctree := $(patsubst %/,%,$(dir $(srctree)))

CRA Git | Maintained and supported by SUSTech CRA and CCSE