aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Sugar <dsugar@tresys.com>2018-10-27 16:13:32 +0000
committerJason Zaman <jason@perfinion.com>2018-11-12 07:17:31 +0800
commitc47e5c0bc2b6d37dc78dab7bceeb64f665a10879 (patch)
treec1002a0c048119d623653d41d0829035fe173c8a
parentsystem/init: Give init_spec_daemon_domain()s the "daemon" attribute (diff)
downloadhardened-refpolicy-c47e5c0bc2b6d37dc78dab7bceeb64f665a10879.tar.gz
hardened-refpolicy-c47e5c0bc2b6d37dc78dab7bceeb64f665a10879.tar.bz2
hardened-refpolicy-c47e5c0bc2b6d37dc78dab7bceeb64f665a10879.zip
Update CUSTOM_BUILDOPT
Have Makefile include CUSTOM_BUILDOPT in generated build.conf Update Makefile.devel to pass CUSTOM_BUILDOPT while building module Signed-off-by: Dave Sugar <dsugar@tresys.com> Signed-off-by: Jason Zaman <jason@perfinion.com>
-rw-r--r--Makefile1
-rw-r--r--support/Makefile.devel4
2 files changed, 5 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 413656bb0..dba38fc45 100644
--- a/Makefile
+++ b/Makefile
@@ -547,6 +547,7 @@ endif
$(verbose) echo "MONOLITHIC ?= n" >> $(headerdir)/build.conf
$(verbose) echo "DIRECT_INITRC ?= $(DIRECT_INITRC)" >> $(headerdir)/build.conf
$(verbose) echo "SYSTEMD ?= $(SYSTEMD)" >> $(headerdir)/build.conf
+ $(verbose) echo "CUSTOM_BUILDOPT ?= $(CUSTOM_BUILDOPT)" >> $(headerdir)/build.conf
$(verbose) echo "override UBAC := $(UBAC)" >> $(headerdir)/build.conf
$(verbose) echo "override MLS_SENS := $(MLS_SENS)" >> $(headerdir)/build.conf
$(verbose) echo "override MLS_CATS := $(MLS_CATS)" >> $(headerdir)/build.conf
diff --git a/support/Makefile.devel b/support/Makefile.devel
index bcca2d985..f3daca11c 100644
--- a/support/Makefile.devel
+++ b/support/Makefile.devel
@@ -70,6 +70,10 @@ ifeq "$(UBAC)" "y"
M4PARAM += -D enable_ubac
endif
+ifneq "$(CUSTOM_BUILDOPT)" ""
+ M4PARAM += $(foreach opt,$(CUSTOM_BUILDOPT),-D $(opt))
+endif
+
# default MLS/MCS sensitivity and category settings.
MLS_SENS ?= 16
MLS_CATS ?= 1024