diff options
| author | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-04-26 20:47:39 +0200 |
|---|---|---|
| committer | Arnaldo Carvalho de Melo <acme@redhat.com> | 2021-04-29 16:22:33 +0200 |
| commit | c6e3bf437184d41d885ba679eab0ddd43f95db56 (patch) | |
| tree | 161c582f0209caffba688118ead48eca9727e5ac /tools/perf | |
| parent | tools build: Allow deferring printing the results of feature detection (diff) | |
| download | linux-c6e3bf437184d41d885ba679eab0ddd43f95db56.tar.xz linux-c6e3bf437184d41d885ba679eab0ddd43f95db56.zip | |
perf build: Defer printing detected features to the end of all feature checks
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>
Diffstat (limited to 'tools/perf')
| -rw-r--r-- | tools/perf/Makefile.config | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 94e31fa75f42..0d6619064a83 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -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 |