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>
[ arighi: context adjustments for 6.4-rc1 ]
Signed-off-by: Andrea Righi <andrea.righi@canonical.com>
This commit is contained in:
Andy Whitcroft
2019-05-08 14:24:40 +01:00
committed by Paolo Pisati
parent a89f22f974
commit c38e39c7aa
+4 -1
View File
@@ -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)