[SRU disco/master-next 1/1] UBUNTU: SAUCE: tools -- fix add ability to disable libbfd

[Andy Whitcroft]

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 <apw at canonical.com>
---
 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 ecdd0e8c5e6d..67848a73a661 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -702,7 +702,8 @@ endif
 
 ifdef HAVE_NO_LIBBFD
   feature-libbfd := 0
-endif
+  $(info libbfd overidden OFF)
+else
 
 ifeq ($(feature-libbfd), 1)
   EXTLIBS += -lbfd
@@ -724,6 +725,8 @@ else
   endif
 endif
 
+endif
+
 ifdef NO_DEMANGLE
   CFLAGS += -DNO_DEMANGLE
 else
-- 
2.20.1