Skip to content

Commit c6e3bf4

Browse files
committed
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 <[email protected]> Signed-off-by: Arnaldo Carvalho de Melo <[email protected]>
1 parent 19177bc commit c6e3bf4

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

tools/perf/Makefile.config

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -299,6 +299,9 @@ ifneq ($(TCMALLOC),)
299299
endif
300300

301301
ifeq ($(FEATURES_DUMP),)
302+
# We will display at the end of this Makefile.config, using $(call feature_display_entries)
303+
# As we may retry some feature detection here, see the disassembler-four-args case, for instance
304+
FEATURE_DISPLAY_DEFERRED := 1
302305
include $(srctree)/tools/build/Makefile.feature
303306
else
304307
include $(FEATURES_DUMP)
@@ -1230,3 +1233,7 @@ $(call detected_var,PYTHON_EMBED_CCOPTS)
12301233
# tests, see the block about libbfd, disassembler-four-args, for instance.
12311234
$(shell rm -f $(FEATURE_DUMP_FILENAME))
12321235
$(foreach feat,$(FEATURE_TESTS),$(shell echo "$(call feature_assign,$(feat))" >> $(FEATURE_DUMP_FILENAME)))
1236+
1237+
ifeq ($(feature_display),1)
1238+
$(call feature_display_entries)
1239+
endif

0 commit comments

Comments
 (0)