diff --git a/tools/perf/Makefile.config b/tools/perf/Makefile.config
index 7d2b4c7a9ba6..a2b1b9a5c608 100644
--- a/tools/perf/Makefile.config
+++ b/tools/perf/Makefile.config
@@ -756,36 +756,36 @@ ifdef HAVE_NO_LIBBFD
   feature-libbfd := 0
   $(info libbfd overidden OFF)
 else
+  ifndef NO_LIBBFD
+    ifeq ($(feature-libbfd), 1)
+      EXTLIBS += -lbfd -lopcodes
+    else
+	  # we are on a system that requires -liberty and (maybe) -lz
+      # to link against -lbfd; test each case individually here
 
-ifeq ($(feature-libbfd), 1)
-  EXTLIBS += -lbfd -lopcodes
-else
-  # we are on a system that requires -liberty and (maybe) -lz
-  # to link against -lbfd; test each case individually here
+      # call all detections now so we get correct
+      # status in VF output
+      $(call feature_check,libbfd-liberty)
+      $(call feature_check,libbfd-liberty-z)
 
-  # call all detections now so we get correct
-  # status in VF output
-  $(call feature_check,libbfd-liberty)
-  $(call feature_check,libbfd-liberty-z)
+      ifeq ($(feature-libbfd-liberty), 1)
+        EXTLIBS += -lbfd -lopcodes -liberty
+        FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -ldl
+      else
+        ifeq ($(feature-libbfd-liberty-z), 1)
+          EXTLIBS += -lbfd -lopcodes -liberty -lz
+          FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -lz -ldl
+        endif
+      endif
+      $(call feature_check,disassembler-four-args)
+    endif
 
-  ifeq ($(feature-libbfd-liberty), 1)
-    EXTLIBS += -lbfd -lopcodes -liberty
-    FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -ldl
-  else
-    ifeq ($(feature-libbfd-liberty-z), 1)
-      EXTLIBS += -lbfd -lopcodes -liberty -lz
-      FEATURE_CHECK_LDFLAGS-disassembler-four-args += -liberty -lz -ldl
+    ifeq ($(feature-libbfd-buildid), 1)
+      CFLAGS += -DHAVE_LIBBFD_BUILDID_SUPPORT
+    else
+      msg := $(warning Old version of libbfd/binutils things like PE executable profiling will not be available);
     endif
   endif
-  $(call feature_check,disassembler-four-args)
-endif
-
-endif
-
-ifeq ($(feature-libbfd-buildid), 1)
-  CFLAGS += -DHAVE_LIBBFD_BUILDID_SUPPORT
-else
-  msg := $(warning Old version of libbfd/binutils things like PE executable profiling will not be available);
 endif
 
 ifdef NO_DEMANGLE