diff options
-rw-r--r-- | tools/perf/config/Makefile | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index 198609e1d696..f80fc7ec8036 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -793,7 +793,7 @@ ifeq ($(dwarf-post-unwind),1) | |||
793 | PERF_FEATURES += dwarf-post-unwind($(dwarf-post-unwind-text)) | 793 | PERF_FEATURES += dwarf-post-unwind($(dwarf-post-unwind-text)) |
794 | endif | 794 | endif |
795 | 795 | ||
796 | # The $(display_lib) controls the default detection message | 796 | # The $(feature_display) controls the default detection message |
797 | # output. It's set if: | 797 | # output. It's set if: |
798 | # - detected features differes from stored features from | 798 | # - detected features differes from stored features from |
799 | # last build (in PERF-FEATURES file) | 799 | # last build (in PERF-FEATURES file) |
@@ -802,24 +802,24 @@ endif | |||
802 | 802 | ||
803 | ifneq ("$(PERF_FEATURES)","$(PERF_FEATURES_FILE)") | 803 | ifneq ("$(PERF_FEATURES)","$(PERF_FEATURES_FILE)") |
804 | $(shell echo "$(PERF_FEATURES)" > $(OUTPUT)PERF-FEATURES) | 804 | $(shell echo "$(PERF_FEATURES)" > $(OUTPUT)PERF-FEATURES) |
805 | display_lib := 1 | 805 | feature_display := 1 |
806 | endif | 806 | endif |
807 | 807 | ||
808 | feature_check = $(eval $(feature_check_code)) | 808 | feature_check = $(eval $(feature_check_code)) |
809 | define feature_check_code | 809 | define feature_check_code |
810 | ifneq ($(feature-$(1)), 1) | 810 | ifneq ($(feature-$(1)), 1) |
811 | display_lib := 1 | 811 | feature_display := 1 |
812 | endif | 812 | endif |
813 | endef | 813 | endef |
814 | 814 | ||
815 | $(foreach feat,$(FEATURE_DISPLAY),$(call feature_check,$(feat))) | 815 | $(foreach feat,$(FEATURE_DISPLAY),$(call feature_check,$(feat))) |
816 | 816 | ||
817 | ifeq ($(VF),1) | 817 | ifeq ($(VF),1) |
818 | display_lib := 1 | 818 | feature_display := 1 |
819 | display_vf := 1 | 819 | display_vf := 1 |
820 | endif | 820 | endif |
821 | 821 | ||
822 | ifeq ($(display_lib),1) | 822 | ifeq ($(feature_display),1) |
823 | $(info ) | 823 | $(info ) |
824 | $(info Auto-detecting system features:) | 824 | $(info Auto-detecting system features:) |
825 | $(foreach feat,$(FEATURE_DISPLAY),$(call feature_print_status,$(feat),)) | 825 | $(foreach feat,$(FEATURE_DISPLAY),$(call feature_print_status,$(feat),)) |
@@ -841,7 +841,7 @@ ifeq ($(display_vf),1) | |||
841 | $(call feature_print_var,LIBDW_DIR) | 841 | $(call feature_print_var,LIBDW_DIR) |
842 | endif | 842 | endif |
843 | 843 | ||
844 | ifeq ($(display_lib),1) | 844 | ifeq ($(feature_display),1) |
845 | $(info ) | 845 | $(info ) |
846 | endif | 846 | endif |
847 | 847 | ||