perf build: Defer printing detected features to the end of all feature checks
authorArnaldo Carvalho de Melo <acme@redhat.com>
Mon, 26 Apr 2021 18:47:39 +0000 (15:47 -0300)
committerArnaldo Carvalho de Melo <acme@redhat.com>
Thu, 29 Apr 2021 14:22:33 +0000 (11:22 -0300)
We were doing it in tools/build/Makefile.feature, after running the
feature checks, but then in tools/perf/Makefile.config we can call more
feature checks when we notice that some feature check failed, like when
libbfd wasn't detected and we add libraries to the LDFLAGS of its
feature check to try again, etc.

Acked-by: Jiri Olsa <jolsa@kernel.org>
Signed-off-by: Arnaldo Carvalho de Melo <acme@redhat.com>
tools/perf/Makefile.config

index 94e31fa75f42b46673416095280ea51cdad11bcc..0d6619064a83835bee32b577e711e37a58c2a148 100644 (file)
@@ -299,6 +299,9 @@ ifneq ($(TCMALLOC),)
 endif
 
 ifeq ($(FEATURES_DUMP),)
+# We will display at the end of this Makefile.config, using $(call feature_display_entries)
+# As we may retry some feature detection here, see the disassembler-four-args case, for instance
+  FEATURE_DISPLAY_DEFERRED := 1
 include $(srctree)/tools/build/Makefile.feature
 else
 include $(FEATURES_DUMP)
@@ -1230,3 +1233,7 @@ $(call detected_var,PYTHON_EMBED_CCOPTS)
 # tests, see the block about libbfd, disassembler-four-args, for instance.
 $(shell rm -f $(FEATURE_DUMP_FILENAME))
 $(foreach feat,$(FEATURE_TESTS),$(shell echo "$(call feature_assign,$(feat))" >> $(FEATURE_DUMP_FILENAME)))
+
+ifeq ($(feature_display),1)
+  $(call feature_display_entries)
+endif