From c38e39c7aa23d7f1672e1b812880ffebc9578381 Mon Sep 17 00:00:00 2001 From: Andy Whitcroft Date: Wed, 8 May 2019 14:24:40 +0100 Subject: [PATCH] UBUNTU: SAUCE: tools -- fix add ability to disable libbfd BugLink: https://bugs.launchpad.net/bugs/1826410 In commit 14541b1e7e ("perf build: Don't unconditionally link the libbfd feature test to -liberty and -lz") the enablement code changed radically neutering our override. Adapt to that new form. Fixes: 546d50456e ("UBUNTU: SAUCE: tools -- add ability to disable libbfd") Signed-off-by: Andy Whitcroft Signed-off-by: Seth Forshee [ arighi: context adjustments for 6.4-rc1 ] Signed-off-by: Andrea Righi --- tools/perf/Makefile.config | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config index 2830741bfba8..e7dfc6fa8a46 100644 --- a/tools/perf/Makefile.config +++ b/tools/perf/Makefile.config @@ -932,7 +932,8 @@ endif ifdef HAVE_NO_LIBBFD feature-libbfd := 0 -endif + $(info libbfd overidden OFF) +else ifdef BUILD_NONDISTRO ifeq ($(feature-libbfd), 1) @@ -970,6 +971,8 @@ ifdef BUILD_NONDISTRO endif endif +endif + ifndef NO_DEMANGLE $(call feature_check,cxa-demangle) ifeq ($(feature-cxa-demangle), 1)