From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.7 required=3.0 tests=HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_NONE, USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by archive.lwn.net (Postfix) with ESMTP id A72777D910 for ; Wed, 11 Mar 2020 16:15:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730019AbgCKQPB (ORCPT ); Wed, 11 Mar 2020 12:15:01 -0400 Received: from sym2.noone.org ([178.63.92.236]:34062 "EHLO sym2.noone.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730099AbgCKQPB (ORCPT ); Wed, 11 Mar 2020 12:15:01 -0400 Received: by sym2.noone.org (Postfix, from userid 1002) id 48cxr35tKGzvjdW; Wed, 11 Mar 2020 17:14:59 +0100 (CET) From: Tobias Klauser To: Daniel Borkmann , Alexei Starovoitov Cc: Song Liu , Yonghong Song , bpf@vger.kernel.org Subject: [PATCH bpf-next v2] bpftool: fix profiler build on systems without /usr/include/asm symlink Date: Wed, 11 Mar 2020 17:14:59 +0100 Message-Id: <20200311161459.6310-1-tklauser@distanz.ch> X-Mailer: git-send-email 2.11.0 In-Reply-To: <20200311123421.3634-1-tklauser@distanz.ch> References: <20200311123421.3634-1-tklauser@distanz.ch> Sender: bpf-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org Archived-At: List-Archive: List-Post: When compiling bpftool on a system where the /usr/include/asm symlink doesn't exist (e.g. on an Ubuntu system without gcc-multilib installed), the build fails with: CLANG skeleton/profiler.bpf.o In file included from skeleton/profiler.bpf.c:4: In file included from /usr/include/linux/bpf.h:11: /usr/include/linux/types.h:5:10: fatal error: 'asm/types.h' file not found #include ^~~~~~~~~~~~~ 1 error generated. make: *** [Makefile:123: skeleton/profiler.bpf.o] Error 1 In certain cases (e.g. for container builds), installing gcc-multilib and all its dependencies - which are otherwise not needed to build bpftool - unnecessarily increases the image size. Thus, fix this by adding /usr/include/$(uname -m)-linux-gnu to the clang search path so can be found. Acked-by: Song Liu Signed-off-by: Tobias Klauser --- tools/bpf/bpftool/Makefile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/tools/bpf/bpftool/Makefile b/tools/bpf/bpftool/Makefile index 20a90d8450f8..db54e9bb873a 100644 --- a/tools/bpf/bpftool/Makefile +++ b/tools/bpf/bpftool/Makefile @@ -120,7 +120,8 @@ $(OUTPUT)_bpftool: $(_OBJS) $(LIBBPF) $(QUIET_LINK)$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(_OBJS) $(LIBS) skeleton/profiler.bpf.o: skeleton/profiler.bpf.c - $(QUIET_CLANG)$(CLANG) -I$(srctree)/tools/lib -g -O2 -target bpf -c $< -o $@ + $(QUIET_CLANG)$(CLANG) -I/usr/include/$(shell uname -m)-linux-gnu \ + -I$(srctree)/tools/lib -g -O2 -target bpf -c $< -o $@ profiler.skel.h: $(OUTPUT)_bpftool skeleton/profiler.bpf.o $(QUIET_GEN)$(OUTPUT)./_bpftool gen skeleton skeleton/profiler.bpf.o > $@ -- 2.25.1