From patchwork Thu Apr 11 08:39:40 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Nicolas Dichtel X-Patchwork-Id: 10895333 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 95655922 for ; Thu, 11 Apr 2019 08:46:36 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 7F76B28B0C for ; Thu, 11 Apr 2019 08:46:36 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 705CA28B16; Thu, 11 Apr 2019 08:46:36 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-7.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C243A28B0C for ; Thu, 11 Apr 2019 08:46:35 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726588AbfDKIqf (ORCPT ); Thu, 11 Apr 2019 04:46:35 -0400 Received: from host.76.145.23.62.rev.coltfrance.com ([62.23.145.76]:56237 "EHLO proxy.6wind.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726121AbfDKIqf (ORCPT ); Thu, 11 Apr 2019 04:46:35 -0400 X-Greylist: delayed 412 seconds by postgrey-1.27 at vger.kernel.org; Thu, 11 Apr 2019 04:46:34 EDT Received: from bretzel.dev.6wind.com (unknown [10.16.0.19]) by proxy.6wind.com (Postfix) with ESMTPS id 337FA29703B; Thu, 11 Apr 2019 10:39:41 +0200 (CEST) Received: from dichtel by bretzel.dev.6wind.com with local (Exim 4.89) (envelope-from ) id 1hEVFF-00012m-22; Thu, 11 Apr 2019 10:39:41 +0200 From: Nicolas Dichtel To: tglx@linutronix.de, jpoimboe@redhat.com, eb@emlix.com, yamada.masahiro@socionext.com, peterz@infradead.org Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org, Nicolas Dichtel Subject: [PATCH linux] objtool: fix pkg-config query in case of cross-compilation Date: Thu, 11 Apr 2019 10:39:40 +0200 Message-Id: <20190411083940.3911-1-nicolas.dichtel@6wind.com> X-Mailer: git-send-email 2.21.0 MIME-Version: 1.0 Sender: linux-kbuild-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kbuild@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP In case of cross-compilation, there may be two pkg-config tools, one for the host and one for the target. Enable to override the default name. Fixes: 056d28d135bc ("objtool: Query pkg-config for libelf location") Signed-off-by: Nicolas Dichtel --- Makefile | 3 ++- tools/objtool/Makefile | 4 ++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/Makefile b/Makefile index 15c8251d4d5e..f12ca3598fc4 100644 --- a/Makefile +++ b/Makefile @@ -953,7 +953,8 @@ mod_sign_cmd = true endif export mod_sign_cmd -HOST_LIBELF_LIBS = $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) +export HOST_PKG_CONFIG ?= pkg-config +HOST_LIBELF_LIBS = $(shell $(HOST_PKG_CONFIG) libelf --libs 2>/dev/null || echo -lelf) ifdef CONFIG_STACK_VALIDATION has_libelf := $(call try-run,\ diff --git a/tools/objtool/Makefile b/tools/objtool/Makefile index 53f8be0f4a1f..4e229e77aacf 100644 --- a/tools/objtool/Makefile +++ b/tools/objtool/Makefile @@ -25,8 +25,8 @@ LIBSUBCMD = $(LIBSUBCMD_OUTPUT)libsubcmd.a OBJTOOL := $(OUTPUT)objtool OBJTOOL_IN := $(OBJTOOL)-in.o -LIBELF_FLAGS := $(shell pkg-config libelf --cflags 2>/dev/null) -LIBELF_LIBS := $(shell pkg-config libelf --libs 2>/dev/null || echo -lelf) +LIBELF_FLAGS := $(shell $(HOST_PKG_CONFIG) libelf --cflags 2>/dev/null) +LIBELF_LIBS := $(shell $(HOST_PKG_CONFIG) libelf --libs 2>/dev/null || echo -lelf) all: $(OBJTOOL)