commit: 901d5bbe56a07b57a4bd4368bb82275c628f6a09
Author: Christian Göttsche <cgzones <AT> googlemail <DOT> com>
AuthorDate: Tue Mar 22 17:11:36 2022 +0000
Commit: Jason Zaman <perfinion <AT> gentoo <DOT> org>
CommitDate: Thu Mar 31 02:40:53 2022 +0000
URL:
https://gitweb.gentoo.org/proj/hardened-refpolicy.git/commit/?id=901d5bbe
Makefile: use override for adding options
When adding program options to checkpolicy and checkmodule use
override to add them even when CHECKPOLICY or CHECKMODULE have been
set by the caller.
Signed-off-by: Christian Göttsche <cgzones <AT> googlemail.com>
Signed-off-by: Jason Zaman <perfinion <AT> gentoo.org>
Makefile | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index 9b5069b9..84c019f9 100644
--- a/Makefile
+++ b/Makefile
@@ -173,16 +173,16 @@ docsdir := $(prefix)/share/doc/$(PKGNAME)
# enable MLS if requested.
ifeq "$(TYPE)" "mls"
M4PARAM += -D enable_mls=true
- CHECKPOLICY += -M
- CHECKMODULE += -M
+ override CHECKPOLICY += -M
+ override CHECKMODULE += -M
gennetfilter += -m
endif
# enable MLS if MCS requested.
ifeq "$(TYPE)" "mcs"
M4PARAM += -D enable_mcs=true
- CHECKPOLICY += -M
- CHECKMODULE += -M
+ override CHECKPOLICY += -M
+ override CHECKMODULE += -M
gennetfilter += -c
endif
@@ -200,7 +200,7 @@ ifeq "$(SYSTEMD)" "y"
endif
ifneq ($(OUTPUT_POLICY),)
- CHECKPOLICY += -c $(OUTPUT_POLICY)
+ override CHECKPOLICY += -c $(OUTPUT_POLICY)
endif
ifneq "$(CUSTOM_BUILDOPT)" ""
