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 <apw@canonical.com>
Signed-off-by: Seth Forshee <seth.forshee@canonical.com>

diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 6887b016c7dc8f099ef981ecccaca8fd4fa817db..92e61731c4bc7cf4a5bca78e09b5b7d425023a0f 100644 (file)
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -825,7 +825,8 @@ endif
 
 ifdef HAVE_NO_LIBBFD
   feature-libbfd := 0
-endif
+  $(info libbfd overidden OFF)
+else
 
 ifeq ($(feature-libbfd), 1)
   EXTLIBS += -lbfd -lopcodes
@@ -856,6 +857,8 @@ else
   msg := $(warning Old version of libbfd/binutils things like PE executable profiling will not be available);
 endif
 
+endif
+
 ifdef NO_DEMANGLE
   CFLAGS += -DNO_DEMANGLE
 else