Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752025AbaDCMX6 (ORCPT ); Thu, 3 Apr 2014 08:23:58 -0400 Received: from mx1.redhat.com ([209.132.183.28]:26798 "EHLO mx1.redhat.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751976AbaDCMXy (ORCPT ); Thu, 3 Apr 2014 08:23:54 -0400 Date: Thu, 3 Apr 2014 08:23:50 -0400 From: Josh Boyer To: Ingo Molnar , Arnaldo Carvalho de Melo , Jiri Olsa Cc: linux-kernel@vger.kernel.org Subject: [PATCH] perf tools: Fix feature check for libdw dwarf unwind Message-ID: <20140403122350.GA15134@hansolo.jdub.homelinux.org> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org When the feature check for libdw dwarf unwind support was added with commit 45757895c7, it required LIBDW_DIR to be set before it would work. However, commit 0a4f2b6a3ba implies that the libdw unwinder should be auto-detected from the installed libraries and not require LIBDW_DIR to be set. The feature check is failing because FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind is only being set when LIBDW_DIR is specified. This causes the feature test to be built without -ldw, which causes it to fail. Fix this by moving the endif for the LIBDW_DIR check up. Signed-off-by: Josh Boyer --- tools/perf/config/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/perf/config/Makefile b/tools/perf/config/Makefile index c23418225c2c..d3e3b7a7d979 100644 --- a/tools/perf/config/Makefile +++ b/tools/perf/config/Makefile @@ -65,10 +65,10 @@ ifndef NO_LIBELF ifdef LIBDW_DIR LIBDW_CFLAGS := -I$(LIBDW_DIR)/include LIBDW_LDFLAGS := -L$(LIBDW_DIR)/lib + endif FEATURE_CHECK_CFLAGS-libdw-dwarf-unwind := $(LIBDW_CFLAGS) FEATURE_CHECK_LDFLAGS-libdw-dwarf-unwind := $(LIBDW_LDFLAGS) -ldw - endif endif # include ARCH specific config -- 1.8.5.3 -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/