Skip to content

Commit 42c4e97

Browse files
committed
selinux: don't use make's grouped targets feature yet
The Linux Kernel currently only requires make v3.82 while the grouped target functionality requires make v4.3. Removed the grouped target introduced in 4ce1f69 ("selinux: ensure av_permissions.h is built when needed") as well as the multiple header file targets in the make rule. This effectively reverts the problem commit. We will revisit this change when make >= 4.3 is required by the rest of the kernel. Cc: [email protected] Fixes: 4ce1f69 ("selinux: ensure av_permissions.h is built when needed") Reported-by: Erwan Velu <[email protected]> Reported-by: Luiz Capitulino <[email protected]> Tested-by: Luiz Capitulino <[email protected]> Signed-off-by: Paul Moore <[email protected]>
1 parent ac9a786 commit 42c4e97

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)