From patchwork Mon Jan 16 21:57:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 44325 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1423456wrn; Mon, 16 Jan 2023 14:07:28 -0800 (PST) X-Google-Smtp-Source: AMrXdXtwcZthiMUddZuu2r0ywy388HjTPwTEUUHnO/QXOhSeEKCZq6+yYQSydwAyDMuGH1uPmuY+ X-Received: by 2002:a17:906:6d0b:b0:871:818e:6e9 with SMTP id m11-20020a1709066d0b00b00871818e06e9mr527869ejr.64.1673906848043; Mon, 16 Jan 2023 14:07:28 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673906848; cv=none; d=google.com; s=arc-20160816; b=LO2jVBNIGioaOvgmbnGMvTA6OBBXTzCy2aMhO7FTJcoOcCEz9exyVQVikWh7VvcFnI H9CELKzB0B2QmLwuihqVo9c0t2vMKhSK6TbSIURHDk8xfT2yhVzQd5rkAiEYt8jo7Utw E/CPluXGsymG0imIDFXSLe6cnem7nCOkBiboD8Gzk4j6rB4ZAwlneCwyjA8Er2Bwt1DH heo9q9atzaA1wMuFsY4ZLKTNY7ltgeKdeHDkhsDog5MMYsZ7Knk8gh+Bp2IAuLqCqrnq D2Ij2sLKlHgweHzk/MvbGITcLBQz1+A/ngGzmMC4k3lBIMgJGxqyW1W3lS2kVifPQofC vVRw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:subject:mime-version:message-id:date :dkim-signature; bh=B3Ud16zHjfzs1yDtdBOr0IHKeq4LI90N49HbHwsKBVo=; b=A7mM9iEiDeDbGoXz9oxelYq/LuRV4z7OoN8HLXdRPVb8Ck00hmxjqs+yyblvoObk5w IrH2GeqB+IY+jSSQC5cXgeEur/PmdNSAkaEdWcvufCEsgHOpNgVyOxqmuWagYoiicc9z ryTqm1iTfMDVYy4YmybRz6bj0ADg3En54bVsrx56ZB5Jttb81ETy7fIteLyZozhxBCNj iaORbh5KYmUj1GuRoGrSFz2n+09yd/qik8kxtuV8/ai5dsqpNeW0XcbiG50mb75zLDAX 8ijS8F5Qs1k4SlFsgd6vhEVaUVMrrRGFEgIUm3xNd1yeNEzaIGmB5HS2oFYouSIc6Ojk OSEQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="V/jI1wdM"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id qa20-20020a170907869400b0087213089f0bsi1644301ejc.167.2023.01.16.14.07.04; Mon, 16 Jan 2023 14:07:28 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b="V/jI1wdM"; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234768AbjAPV6M (ORCPT + 99 others); Mon, 16 Jan 2023 16:58:12 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43424 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S234608AbjAPV6L (ORCPT ); Mon, 16 Jan 2023 16:58:11 -0500 Received: from mail-pj1-x1049.google.com (mail-pj1-x1049.google.com [IPv6:2607:f8b0:4864:20::1049]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 81967241FB for ; Mon, 16 Jan 2023 13:58:10 -0800 (PST) Received: by mail-pj1-x1049.google.com with SMTP id mh11-20020a17090b4acb00b002271dde7ec6so4638956pjb.0 for ; Mon, 16 Jan 2023 13:58:10 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=to:from:subject:mime-version:message-id:date:from:to:cc:subject :date:message-id:reply-to; bh=B3Ud16zHjfzs1yDtdBOr0IHKeq4LI90N49HbHwsKBVo=; b=V/jI1wdMtDH79NoMgvZ02I7d05HtyPtxA6BV0pCpSpsdpG2DNlNXj3whT94SF27JCC 4aA9HDu6eubdmaggQcRHm1qL5flQNQG3PyKikqi1azVf7tS4zYU5QYAScaCPqIENtpZN 2GgDi2BtKyE16wMUL1gilrZPBQgEkgYTMfth4nsIjd/YPb5mKTrr78TU4JjM+JxoLr34 FMKXgxbJVbMnWXb84vSFH6DzER4yV3+EfXnQtB/KDVITzGuaOtKSqXusUKGjPw5Oz8m5 4U2KZ6+CVG08+hlgrAenltjQsfd07Kl6BMiWykDAV4tkicm83+slZAuvvqYOiwdn0DWy FX0w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:subject:mime-version:message-id:date:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=B3Ud16zHjfzs1yDtdBOr0IHKeq4LI90N49HbHwsKBVo=; b=1sUgKDvSx9Giu1WSrOzbQTM6gQV26ohxn2x64duZfGwLqHhNjjs8oCkCpBS04QK3ZN ZVWsf3CVBBuzFKFYZYGCjGjXBpoe9Uo5Hx/GAB4vGPx9bM4LhsQhiMGqg7bBuQDey+ah 7/nj6fy9nJYmDnXMqrmdyXfvm7o0qGickI4lhfkXoMxoo5vlNoHIK0TftbeO2ubx30Ua URMFMBHhQ0Rwi+KrOabfODeC47zFCAly6PrlC/lclIz6bBh6nkjbs/b4uPeFAFcH9m/J V1TSnkCbBp1Uh8mJx8bh62akBhgkSeBBnGcvP/laGH3dF0F2Qqo7ouOGAhaEPbgy3arT Ek/A== X-Gm-Message-State: AFqh2kpa7wr7hE4t3JQHC5gVxwdcUQTTCU0636s+7dzhOVxclquH13ht uHb09jIq2wRszdbhThTvk83uPkEcwWgq X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:5088:3695:f3a5:d639]) (user=irogers job=sendgmr) by 2002:a05:6a00:1c9d:b0:58a:f2e5:db46 with SMTP id y29-20020a056a001c9d00b0058af2e5db46mr80189pfw.61.1673906290006; Mon, 16 Jan 2023 13:58:10 -0800 (PST) Date: Mon, 16 Jan 2023 13:57:50 -0800 Message-Id: <20230116215751.633675-1-irogers@google.com> Mime-Version: 1.0 X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 1/2] tools/resolve_btfids: Install subcmd headers From: Ian Rogers To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Connor OBrien , Nathan Chancellor , Ian Rogers , Kumar Kartikeya Dwivedi , bpf@vger.kernel.org, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1754775679030952179?= X-GMAIL-MSGID: =?utf-8?q?1755218547039691320?= Previously tools/lib/subcmd was added to the include path, switch to installing the headers and then including from that directory. This avoids dependencies on headers internal to tools/lib/subcmd. Add the missing subcmd directory to the affected #include. Signed-off-by: Ian Rogers Acked-by: iri Olsa --- tools/bpf/resolve_btfids/Makefile | 19 ++++++++++++++----- tools/bpf/resolve_btfids/main.c | 2 +- 2 files changed, 15 insertions(+), 6 deletions(-) diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile index 19a3112e271a..76b737b2560d 100644 --- a/tools/bpf/resolve_btfids/Makefile +++ b/tools/bpf/resolve_btfids/Makefile @@ -35,21 +35,29 @@ SUBCMD_SRC := $(srctree)/tools/lib/subcmd/ BPFOBJ := $(OUTPUT)/libbpf/libbpf.a LIBBPF_OUT := $(abspath $(dir $(BPFOBJ)))/ SUBCMDOBJ := $(OUTPUT)/libsubcmd/libsubcmd.a +SUBCMD_OUT := $(abspath $(dir $(SUBCMDOBJ)))/ LIBBPF_DESTDIR := $(LIBBPF_OUT) LIBBPF_INCLUDE := $(LIBBPF_DESTDIR)include +SUBCMD_DESTDIR := $(SUBCMD_OUT) +SUBCMD_INCLUDE := $(SUBCMD_DESTDIR)include + BINARY := $(OUTPUT)/resolve_btfids BINARY_IN := $(BINARY)-in.o all: $(BINARY) +prepare: $(BPFOBJ) $(SUBCMDOBJ) + $(OUTPUT) $(OUTPUT)/libsubcmd $(LIBBPF_OUT): $(call msg,MKDIR,,$@) $(Q)mkdir -p $(@) $(SUBCMDOBJ): fixdep FORCE | $(OUTPUT)/libsubcmd - $(Q)$(MAKE) -C $(SUBCMD_SRC) OUTPUT=$(abspath $(dir $@))/ $(abspath $@) + $(Q)$(MAKE) -C $(SUBCMD_SRC) OUTPUT=$(SUBCMD_OUT) \ + DESTDIR=$(SUBCMD_DESTDIR) prefix= \ + $(abspath $@) install_headers $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OUT) $(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) OUTPUT=$(LIBBPF_OUT) \ @@ -60,14 +68,14 @@ CFLAGS += -g \ -I$(srctree)/tools/include \ -I$(srctree)/tools/include/uapi \ -I$(LIBBPF_INCLUDE) \ - -I$(SUBCMD_SRC) + -I$(SUBCMD_INCLUDE) LIBS = -lelf -lz export srctree OUTPUT CFLAGS Q include $(srctree)/tools/build/Makefile.include -$(BINARY_IN): $(BPFOBJ) fixdep FORCE | $(OUTPUT) +$(BINARY_IN): fixdep FORCE prepare | $(OUTPUT) $(Q)$(MAKE) $(build)=resolve_btfids $(BINARY): $(BPFOBJ) $(SUBCMDOBJ) $(BINARY_IN) @@ -79,7 +87,8 @@ clean_objects := $(wildcard $(OUTPUT)/*.o \ $(OUTPUT)/.*.o.d \ $(LIBBPF_OUT) \ $(LIBBPF_DESTDIR) \ - $(OUTPUT)/libsubcmd \ + $(SUBCMD_OUT) \ + $(SUBCMD_DESTDIR) \ $(OUTPUT)/resolve_btfids) ifneq ($(clean_objects),) @@ -96,4 +105,4 @@ tags: FORCE: -.PHONY: all FORCE clean tags +.PHONY: all FORCE clean tags prepare diff --git a/tools/bpf/resolve_btfids/main.c b/tools/bpf/resolve_btfids/main.c index 80cd7843c677..77058174082d 100644 --- a/tools/bpf/resolve_btfids/main.c +++ b/tools/bpf/resolve_btfids/main.c @@ -75,7 +75,7 @@ #include #include #include -#include +#include #define BTF_IDS_SECTION ".BTF_ids" #define BTF_ID "__BTF_ID__" From patchwork Mon Jan 16 21:57:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ian Rogers X-Patchwork-Id: 44326 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:eb09:0:0:0:0:0 with SMTP id s9csp1423777wrn; Mon, 16 Jan 2023 14:08:14 -0800 (PST) X-Google-Smtp-Source: AMrXdXs/Se8PkMsMzoC1pYToui/dFFY3MAZ+PEF0lcDcARcl7oHct+xPJqlqMAMnrn7mKerlqq6R X-Received: by 2002:a17:907:a506:b0:85b:9540:4ca7 with SMTP id vr6-20020a170907a50600b0085b95404ca7mr624868ejc.30.1673906894222; Mon, 16 Jan 2023 14:08:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1673906894; cv=none; d=google.com; s=arc-20160816; b=N85WMkvEi7JZ9eYPSH3QUPIjeq/nnDRxzUQtuaLyIa90WupQ8/EnW2oWc/V2xXTcpQ 5kIEZg7V3y0w5imExtqUi5wd1ZKswllzKPaSIjFA3T0q8sAw9dXJMAauoya39j7Soj1X DU54RcG4yy8XteGtcXPGQG637qF+q1JBXw7fiL4sbjgVyYJR8wVg0SVV6PDVjlgXaDTb E7vVQkHkrd+HCsglK9g1vunxmDMEsKRwRSNoAqBDjRB2c6iMhNJDWCBGKYom6Sdf3fQY 4Byg3yowG/MaAFrbsf6tBgKU5qgR9HfBn2aGz1C/Huq8NUWIL1rZfOp5BxdH9EAd/b6k uFLg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:to:from:subject:references:mime-version :message-id:in-reply-to:date:dkim-signature; bh=im4HZCj7jcJlp9Gtkw1K/6eYSSab6dr0jizMwUKesmY=; b=oablweghx3HfUfyWSbX1PXStMrr4qZRSHy6LjytNDwIJrnwVPX8xBT6HCiSM3lcyOf y1QmJboen75is6KS86/L7HdcJhLnXWm2eozN7VBdIHp/K8zF6320CxmhYk8/6+HxK7Q5 MvP7+WVtTITZdWFBY7mRccTeM8krk/fsp/H8FZZzbF3o7Lz+UXjlhfS523olAri6Rylw EdOFRfyQCtBCgZO4sqO54BzfpQb966Vq5v2ah4NLgFbAYPx7hmNH29O0AeeFAkp3QfUm J2mCLPgwKdm61Hg1FPeSvIaGZ9CrigloblveumWNufPQXA03VzaomvA/U0YAvR1sNXf/ rcLg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=mFNK+1IL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id ae1-20020a17090725c100b007c4f78e610asi2286ejc.442.2023.01.16.14.07.50; Mon, 16 Jan 2023 14:08:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@google.com header.s=20210112 header.b=mFNK+1IL; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=REJECT sp=REJECT dis=NONE) header.from=google.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234945AbjAPV6V (ORCPT + 99 others); Mon, 16 Jan 2023 16:58:21 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:43970 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S232686AbjAPV6T (ORCPT ); Mon, 16 Jan 2023 16:58:19 -0500 Received: from mail-pf1-x449.google.com (mail-pf1-x449.google.com [IPv6:2607:f8b0:4864:20::449]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 1DB842529A for ; Mon, 16 Jan 2023 13:58:18 -0800 (PST) Received: by mail-pf1-x449.google.com with SMTP id f15-20020a62380f000000b0058db55a8d7aso1145183pfa.21 for ; Mon, 16 Jan 2023 13:58:18 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20210112; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :from:to:cc:subject:date:message-id:reply-to; bh=im4HZCj7jcJlp9Gtkw1K/6eYSSab6dr0jizMwUKesmY=; b=mFNK+1ILDrtb/vjVJyN/aZBKd7qUO6uZIXxu8LzzcKGw5Ri7j+QgXk9p/PCz4MorJl EVMHWFmDbMz3lnAIez05n6KoU+vt1PA1OFfclqx2r5xJiiiy3D6noqryXHDQK4v1HAt4 VQciOtUsTwLOG3/WtnkGd+t4i4A2JNaA4xf9yK6RHDdCSMpQp0lxB4zgyP0BWz8QuPVl pPvriRmmAX+7PMhRdm7KgJibuKxi4ncRPl+T9e4VrToftfJfa2FTHjSWf00FtXH23slH 1HRnZBQUTZmWlQMGRADtdnzUH31FFhVQDHed3cdHNzAA4vRE/m/50h2bRr8hQ1wrPaU1 YRvA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=to:from:subject:references:mime-version:message-id:in-reply-to:date :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=im4HZCj7jcJlp9Gtkw1K/6eYSSab6dr0jizMwUKesmY=; b=tX77RIsIuZgLwPHcu2z1JL2zt8u0/3nwhBAK5YlukiZ226+9HYbo4nBYbCewA4KDHL NcmDZ86EkXB7uFGD08wPZlPWd/43GZvvm+z2mjmsKntb+42ckWwkbcLuzgiC82VTYseW r8NDY7S7wJa2hyVEOw91mZ9Y7vzecTyUMM2BMlzqAIVeycCa0PokHfyHi5Z/xi8LcKQU WFy3pemixX3q9MsWrNmE/mrkE8WcD6cAnZOMDOHediJYSH90kQ5jtxqUn6pS8otKeVzM dFAfCqA/eVEa46TeSBoxwkhixzFAMLrm4S+wC2suw2o4tYVRyLz9Mm2C5+IdnAv2gkU7 Y5uA== X-Gm-Message-State: AFqh2krOZ1rbQ2E0RCfcRXIXKqtrnbQ1/TLeEgbWQlS1jJ8G2Oov7ROv pKt/8xn9zFuBpf7bq+j3UXnLpg3ZjAuM X-Received: from irogers.svl.corp.google.com ([2620:15c:2d4:203:5088:3695:f3a5:d639]) (user=irogers job=sendgmr) by 2002:a17:90a:408e:b0:229:2296:4be3 with SMTP id l14-20020a17090a408e00b0022922964be3mr81847pjg.5.1673906297579; Mon, 16 Jan 2023 13:58:17 -0800 (PST) Date: Mon, 16 Jan 2023 13:57:51 -0800 In-Reply-To: <20230116215751.633675-1-irogers@google.com> Message-Id: <20230116215751.633675-2-irogers@google.com> Mime-Version: 1.0 References: <20230116215751.633675-1-irogers@google.com> X-Mailer: git-send-email 2.39.0.314.g84b9a713c41-goog Subject: [PATCH v2 2/2] tools/resolve_btfids: Alter how HOSTCC is forced From: Ian Rogers To: Alexei Starovoitov , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Connor OBrien , Nathan Chancellor , Ian Rogers , Kumar Kartikeya Dwivedi , bpf@vger.kernel.org, linux-kernel@vger.kernel.org X-Spam-Status: No, score=-9.6 required=5.0 tests=BAYES_00,DKIMWL_WL_MED, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_NONE, SPF_HELO_NONE,SPF_PASS,USER_IN_DEF_DKIM_WL autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1755218595104021430?= X-GMAIL-MSGID: =?utf-8?q?1755218595104021430?= HOSTCC is always wanted when building. Setting CC to HOSTCC happens after tools/scripts/Makefile.include is included, meaning flags are set assuming say CC is gcc, but then it can be later set to HOSTCC which may be clang. tools/scripts/Makefile.include is needed for host set up and common macros in objtool's Makefile. Rather than override CC to HOSTCC, just pass CC as HOSTCC to Makefile.build, the libsubcmd builds and the linkage step. This means the Makefiles don't see things like CC changing and tool flag determination, and similar, work properly. Also, clear the passed subdir as otherwise an outer build may break by inadvertently passing an inappropriate value. Signed-off-by: Ian Rogers --- tools/bpf/resolve_btfids/Makefile | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/tools/bpf/resolve_btfids/Makefile b/tools/bpf/resolve_btfids/Makefile index 76b737b2560d..515d87b32fb8 100644 --- a/tools/bpf/resolve_btfids/Makefile +++ b/tools/bpf/resolve_btfids/Makefile @@ -18,14 +18,11 @@ else endif # always use the host compiler -AR = $(HOSTAR) -CC = $(HOSTCC) -LD = $(HOSTLD) -ARCH = $(HOSTARCH) +HOST_OVERRIDES := AR=$(HOSTAR) CC="$(HOSTCC)" LD="$(HOSTLD)" AR="$(HOSTAR)" \ + ARCH=$(HOSTARCH) EXTRA_CFLAGS="$(HOSTCFLAGS) $(KBUILD_HOSTCFLAGS)" + RM ?= rm CROSS_COMPILE = -CFLAGS := $(KBUILD_HOSTCFLAGS) -LDFLAGS := $(KBUILD_HOSTLDFLAGS) OUTPUT ?= $(srctree)/tools/bpf/resolve_btfids/ @@ -56,12 +53,12 @@ $(OUTPUT) $(OUTPUT)/libsubcmd $(LIBBPF_OUT): $(SUBCMDOBJ): fixdep FORCE | $(OUTPUT)/libsubcmd $(Q)$(MAKE) -C $(SUBCMD_SRC) OUTPUT=$(SUBCMD_OUT) \ - DESTDIR=$(SUBCMD_DESTDIR) prefix= \ + DESTDIR=$(SUBCMD_DESTDIR) $(HOST_OVERRIDES) prefix= subdir= \ $(abspath $@) install_headers $(BPFOBJ): $(wildcard $(LIBBPF_SRC)/*.[ch] $(LIBBPF_SRC)/Makefile) | $(LIBBPF_OUT) $(Q)$(MAKE) $(submake_extras) -C $(LIBBPF_SRC) OUTPUT=$(LIBBPF_OUT) \ - DESTDIR=$(LIBBPF_DESTDIR) prefix= EXTRA_CFLAGS="$(CFLAGS)" \ + DESTDIR=$(LIBBPF_DESTDIR) $(HOST_OVERRIDES) prefix= subdir= \ $(abspath $@) install_headers CFLAGS += -g \ @@ -76,11 +73,11 @@ export srctree OUTPUT CFLAGS Q include $(srctree)/tools/build/Makefile.include $(BINARY_IN): fixdep FORCE prepare | $(OUTPUT) - $(Q)$(MAKE) $(build)=resolve_btfids + $(Q)$(MAKE) $(build)=resolve_btfids $(HOST_OVERRIDES) $(BINARY): $(BPFOBJ) $(SUBCMDOBJ) $(BINARY_IN) $(call msg,LINK,$@) - $(Q)$(CC) $(BINARY_IN) $(LDFLAGS) -o $@ $(BPFOBJ) $(SUBCMDOBJ) $(LIBS) + $(Q)$(HOSTCC) $(BINARY_IN) $(KBUILD_HOSTLDFLAGS) -o $@ $(BPFOBJ) $(SUBCMDOBJ) $(LIBS) clean_objects := $(wildcard $(OUTPUT)/*.o \ $(OUTPUT)/.*.o.cmd \