Commit 58683600 authored Dec 23, 2015 by Jiri Olsa Committed by Arnaldo Carvalho de Melo Jan 06, 2016

perf build: Use FEATURE-DUMP in bpf subproject



Using FEATURE-DUMP in bpf subproject for features detection in case bpf
is built via perf. Keeping the current features detection otherwise.

Signed-off-by: Jiri Olsa <jolsa@kernel.org>
Tested-by: Wang Nan <wangnan0@huawei.com>
Cc: David Ahern <dsahern@gmail.com>
Cc: Namhyung Kim <namhyung@kernel.org>
Cc: Peter Zijlstra <a.p.zijlstra@chello.nl>
Cc: Zefan Li <lizefan@huawei.com>
Cc: pi3orama <pi3orama@163.com>
Link: http://lkml.kernel.org/r/1450893514-9158-6-git-send-email-jolsa@kernel.org


Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>

parent 936d120d

tools/lib/bpf/Makefile

+4 −0

Original line number	Diff line number	Diff line
		@@ -80,7 +80,11 @@ endif
		endif

		ifeq ($(check_feat),1)
		ifeq ($(FEATURES_DUMP),)
		include $(srctree)/tools/build/Makefile.feature
		else
		include $(FEATURES_DUMP)
		endif
		endif

		export prefix libdir src obj

tools/perf/Makefile.perf

+1 −1

Original line number	Diff line number	Diff line
		@@ -436,7 +436,7 @@ $(LIBAPI)-clean:
		$(Q)$(MAKE) -C $(LIB_DIR) O=$(OUTPUT) clean >/dev/null

		$(LIBBPF): fixdep FORCE
		$(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a
		$(Q)$(MAKE) -C $(BPF_DIR) O=$(OUTPUT) $(OUTPUT)libbpf.a FEATURES_DUMP=$(realpath $(OUTPUT)FEATURE-DUMP)

		$(LIBBPF)-clean:
		$(call QUIET_CLEAN, libbpf)

Admin message