diff options
-rw-r--r-- | tools/perf/config/Makefile | 34 |
1 files changed, 23 insertions, 11 deletions
diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index a71fb395e38f..a57d59e7fe4b 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile | |||
@@ -194,7 +194,10 @@ VF_FEATURE_TESTS = \ | |||
194 | stackprotector-all \ | 194 | stackprotector-all \ |
195 | timerfd \ | 195 | timerfd \ |
196 | libunwind-debug-frame \ | 196 | libunwind-debug-frame \ |
197 | bionic | 197 | bionic \ |
198 | liberty \ | ||
199 | liberty-z \ | ||
200 | cplus-demangle | ||
198 | 201 | ||
199 | # Set FEATURE_CHECK_(C|LD)FLAGS-all for all CORE_FEATURE_TESTS features. | 202 | # Set FEATURE_CHECK_(C|LD)FLAGS-all for all CORE_FEATURE_TESTS features. |
200 | # If in the future we need per-feature checks/flags for features not | 203 | # If in the future we need per-feature checks/flags for features not |
@@ -512,7 +515,21 @@ else | |||
512 | endif | 515 | endif |
513 | 516 | ||
514 | ifeq ($(feature-libbfd), 1) | 517 | ifeq ($(feature-libbfd), 1) |
515 | EXTLIBS += -lbfd -lz -liberty | 518 | EXTLIBS += -lbfd |
519 | |||
520 | # call all detections now so we get correct | ||
521 | # status in VF output | ||
522 | $(call feature_check,liberty) | ||
523 | $(call feature_check,liberty-z) | ||
524 | $(call feature_check,cplus-demangle) | ||
525 | |||
526 | ifeq ($(feature-liberty), 1) | ||
527 | EXTLIBS += -liberty | ||
528 | else | ||
529 | ifeq ($(feature-liberty-z), 1) | ||
530 | EXTLIBS += -liberty -lz | ||
531 | endif | ||
532 | endif | ||
516 | endif | 533 | endif |
517 | 534 | ||
518 | ifdef NO_DEMANGLE | 535 | ifdef NO_DEMANGLE |
@@ -523,15 +540,10 @@ else | |||
523 | CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT | 540 | CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT |
524 | else | 541 | else |
525 | ifneq ($(feature-libbfd), 1) | 542 | ifneq ($(feature-libbfd), 1) |
526 | $(call feature_check,liberty) | 543 | ifneq ($(feature-liberty), 1) |
527 | ifeq ($(feature-liberty), 1) | 544 | ifneq ($(feature-liberty-z), 1) |
528 | EXTLIBS += -lbfd -liberty | 545 | # we dont have neither HAVE_CPLUS_DEMANGLE_SUPPORT |
529 | else | 546 | # or any of 'bfd iberty z' trinity |
530 | $(call feature_check,liberty-z) | ||
531 | ifeq ($(feature-liberty-z), 1) | ||
532 | EXTLIBS += -lbfd -liberty -lz | ||
533 | else | ||
534 | $(call feature_check,cplus-demangle) | ||
535 | ifeq ($(feature-cplus-demangle), 1) | 547 | ifeq ($(feature-cplus-demangle), 1) |
536 | EXTLIBS += -liberty | 548 | EXTLIBS += -liberty |
537 | CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT | 549 | CFLAGS += -DHAVE_CPLUS_DEMANGLE_SUPPORT |