mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: "Thomas Weißschuh" <thomas.weissschuh@linutronix.de>
To: Nathan Chancellor <nathan@kernel.org>,
	Nicolas Schier <nsc@kernel.org>,  Brian Cain <bcain@kernel.org>
Cc: linux-kbuild@vger.kernel.org, linux-kernel@vger.kernel.org,
	bpf@vger.kernel.org, linux-hexagon@vger.kernel.org,
	"Thomas Weißschuh" <thomas.weissschuh@linutronix.de>
Subject: [PATCH 4/5] kbuild: uapi: split out command conditions into variables
Date: Tue, 23 Dec 2025 08:04:11 +0100	[thread overview]
Message-ID: <20251223-uapi-nostdinc-v1-4-d91545d794f7@linutronix.de> (raw)
In-Reply-To: <20251223-uapi-nostdinc-v1-0-d91545d794f7@linutronix.de>

The condition logic will become a bit more complicated.

Split them out into dedicated variables so they stay readable.

Signed-off-by: Thomas Weißschuh <thomas.weissschuh@linutronix.de>
---
 usr/include/Makefile | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/usr/include/Makefile b/usr/include/Makefile
index fd29c11c35cb..fa01bcda21f5 100644
--- a/usr/include/Makefile
+++ b/usr/include/Makefile
@@ -150,12 +150,15 @@ endif
 
 always-y := $(patsubst $(obj)/%.h,%.hdrtest, $(shell find $(obj) -name '*.h' 2>/dev/null))
 
+target-no-libc = $(filter-out $(uses-libc), $*.h)
+target-can-compile = $(filter-out $(no-header-test), $*.h)
+
 # Include the header twice to detect missing include guard.
 quiet_cmd_hdrtest = HDRTEST $<
       cmd_hdrtest = \
 		$(CC) $(c_flags) -fsyntax-only -Werror -x c /dev/null \
-			$(if $(filter-out $(uses-libc), $*.h), -nostdinc) \
-			$(if $(filter-out $(no-header-test), $*.h), -include $< -include $<); \
+			$(if $(target-no-libc), -nostdinc) \
+			$(if $(target-can-compile), -include $< -include $<); \
 		$(PERL) $(src)/headers_check.pl $(obj) $<; \
 		touch $@
 

-- 
2.52.0


  parent reply	other threads:[~2025-12-23  7:04 UTC|newest]

Thread overview: 8+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2025-12-23  7:04 [PATCH 0/5] kbuild: uapi: improvements to header testing Thomas Weißschuh
2025-12-23  7:04 ` [PATCH 1/5] kbuild: uapi: validate that headers do not use libc Thomas Weißschuh
2025-12-23  7:04 ` [PATCH 2/5] hexagon: Drop invalid UAPI header asm/signal.h Thomas Weißschuh
2025-12-23  7:04 ` [PATCH 3/5] kbuild: uapi: don't compile test bpf_perf_event.h on xtensa Thomas Weißschuh
2025-12-23  7:04 ` Thomas Weißschuh [this message]
2025-12-23  7:04 ` [PATCH 5/5] kbuild: uapi: drop dependency on CC_CAN_LINK Thomas Weißschuh
2025-12-30 20:31 ` [PATCH 0/5] kbuild: uapi: improvements to header testing Nathan Chancellor
2026-01-06 22:10 ` Nathan Chancellor

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20251223-uapi-nostdinc-v1-4-d91545d794f7@linutronix.de \
    --to=thomas.weissschuh@linutronix.de \
    --cc=bcain@kernel.org \
    --cc=bpf@vger.kernel.org \
    --cc=linux-hexagon@vger.kernel.org \
    --cc=linux-kbuild@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=nathan@kernel.org \
    --cc=nsc@kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®