Skip to content

Commit 1419c3b

Browse files
committed
Merge tag 'selinux-pr-20230601' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux
Pull selinux fix from Paul Moore: "A small SELinux Makefile fix to resolve a problem seen when building the kernel with older versions of make. The fix is pretty trivial and effectively reverts a patch that was merged during the last merge window" * tag 'selinux-pr-20230601' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux: selinux: don't use make's grouped targets feature yet
2 parents c43a6ff + 42c4e97 commit 1419c3b

File tree

1 file changed

+5
-1
lines changed

1 file changed

+5
-1
lines changed

security/selinux/Makefile

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,5 +26,9 @@ quiet_cmd_flask = GEN $(obj)/flask.h $(obj)/av_permissions.h
2626
cmd_flask = $< $(obj)/flask.h $(obj)/av_permissions.h
2727

2828
targets += flask.h av_permissions.h
29-
$(obj)/flask.h $(obj)/av_permissions.h &: scripts/selinux/genheaders/genheaders FORCE
29+
# once make >= 4.3 is required, we can use grouped targets in the rule below,
30+
# which basically involves adding both headers and a '&' before the colon, see
31+
# the example below:
32+
# $(obj)/flask.h $(obj)/av_permissions.h &: scripts/selinux/...
33+
$(obj)/flask.h: scripts/selinux/genheaders/genheaders FORCE
3034
$(call if_changed,flask)

0 commit comments

Comments
 (0)