From patchwork Mon Jan 30 18:35:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mathieu Desnoyers X-Patchwork-Id: 13121666 X-Patchwork-Delegate: bpf@iogearbox.net Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 63CC2C54EAA for ; Mon, 30 Jan 2023 18:36:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238020AbjA3SgI (ORCPT ); Mon, 30 Jan 2023 13:36:08 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:44220 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S237895AbjA3SgI (ORCPT ); Mon, 30 Jan 2023 13:36:08 -0500 Received: from smtpout.efficios.com (unknown [IPv6:2607:5300:203:b2ee::31e5]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4A0CE26AD; Mon, 30 Jan 2023 10:35:56 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=efficios.com; s=smtpout1; t=1675103755; bh=AYGBgN50Jr1DUDnzCE+Pzynb8j9uxfAHOfkP82pWKaU=; h=From:To:Cc:Subject:Date:From; b=NgUHyCRBAip4aOgELlG0MTM/tlyiZ0/5JnsMFENUMRIaoj7CahT30UZ4Fne4We8lK iFcxEqINtnPr9hTS3Q7Ctu3WOTEdYwhyULhXSEKoiXjZ2kXrZf5AhHa+E5NEqJzrX7 X1ogrYuSABJt/4dPrtleVeNSuWQ5ZPkR2bQXnk8JHjmkUB4NXTiCSIR6fs+le0Hkl1 XgqWCwi+uWMLjx3BehePK63VNjwgXqFDywMK1bWHxeCiIhwqumXuXH3jv9ndpFwE70 mC4fnML9NV+ydck5aVL3LqXK1MV9g9OjwMGyCppV4OHHVDszwDtzIVqRwCtMrTRU9c 9RD27jZG1QrPQ== Received: from localhost.localdomain (192-222-180-24.qc.cable.ebox.net [192.222.180.24]) by smtpout.efficios.com (Postfix) with ESMTPSA id 4P5H1k6F44zhmX; Mon, 30 Jan 2023 13:35:54 -0500 (EST) From: Mathieu Desnoyers To: Alexei Starovoitov Cc: linux-kernel@vger.kernel.org, Mathieu Desnoyers , Shuah Khan , bpf@vger.kernel.org, Shuah Khan , linux-kselftest@vger.kernel.org, Ingo Molnar , Daniel Borkmann , Andrii Nakryiko , Martin KaFai Lau , Song Liu , Yonghong Song , John Fastabend , KP Singh , Stanislav Fomichev , Hao Luo , Jiri Olsa , Mykola Lysenko , stable@vger.kernel.org Subject: [PATCH bpf-next 1/2] selftests: bpf: Fix incorrect kernel headers search path Date: Mon, 30 Jan 2023 13:35:48 -0500 Message-Id: <20230130183549.85471-1-mathieu.desnoyers@efficios.com> X-Mailer: git-send-email 2.25.1 MIME-Version: 1.0 Precedence: bulk List-ID: X-Mailing-List: bpf@vger.kernel.org X-Patchwork-Delegate: bpf@iogearbox.net Use $(KHDR_INCLUDES) as lookup path for kernel headers. This prevents building against kernel headers from the build environment in scenarios where kernel headers are installed into a specific output directory (O=...). Signed-off-by: Mathieu Desnoyers Acked-by: Shuah Khan Cc: Cc: Shuah Khan Cc: linux-kselftest@vger.kernel.org Cc: Ingo Molnar Cc: Alexei Starovoitov Cc: Daniel Borkmann Cc: Andrii Nakryiko Cc: Martin KaFai Lau Cc: Song Liu Cc: Yonghong Song Cc: John Fastabend Cc: KP Singh Cc: Stanislav Fomichev Cc: Hao Luo Cc: Jiri Olsa Cc: Mykola Lysenko Cc: [5.18+] --- tools/testing/selftests/bpf/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/testing/selftests/bpf/Makefile b/tools/testing/selftests/bpf/Makefile index c22c43bbee19..6998c816afef 100644 --- a/tools/testing/selftests/bpf/Makefile +++ b/tools/testing/selftests/bpf/Makefile @@ -327,7 +327,7 @@ endif CLANG_SYS_INCLUDES = $(call get_sys_includes,$(CLANG),$(CLANG_TARGET_ARCH)) BPF_CFLAGS = -g -Werror -D__TARGET_ARCH_$(SRCARCH) $(MENDIAN) \ -I$(INCLUDE_DIR) -I$(CURDIR) -I$(APIDIR) \ - -I$(abspath $(OUTPUT)/../usr/include) + $(KHDR_INCLUDES) CLANG_CFLAGS = $(CLANG_SYS_INCLUDES) \ -Wno-compare-distinct-pointer-types