diff --git a/repos/base-hw/lib/mk/spec/x86_64/core-muen_on.mk b/repos/base-hw/lib/mk/spec/x86_64/core-muen_on.mk index e6d297af5..1c44f78fd 100644 --- a/repos/base-hw/lib/mk/spec/x86_64/core-muen_on.mk +++ b/repos/base-hw/lib/mk/spec/x86_64/core-muen_on.mk @@ -4,6 +4,8 @@ # \date 2015-06-02 # +REQUIRES = muen + # add include paths INC_DIR += $(REP_DIR)/src/core/include/spec/x86_64/muen diff --git a/repos/base-hw/src/kernel/spec/muen/target.mk b/repos/base-hw/src/kernel/spec/muen/target.mk index 150ef0a55..d322fbd0f 100644 --- a/repos/base-hw/src/kernel/spec/muen/target.mk +++ b/repos/base-hw/src/kernel/spec/muen/target.mk @@ -1,19 +1,19 @@ -TARGET = muen -REQUIRES = x86_64 muen -MUEN_SRC_DIR = $(call select_from_ports,muen)/src/kernel/muen -MUEN_BUILD_DIR = $(BUILD_BASE_DIR)/kernel -MUEN_CONF_FILE = $(MUEN_BUILD_DIR)/muen.conf -MUEN_DST_DIR = $(MUEN_BUILD_DIR)/muen -MUEN_LOG = $(MUEN_BUILD_DIR)/build.log +TARGET = muen +REQUIRES = x86_64 muen +MUEN_SRC_DIR = $(call select_from_ports,muen)/src/kernel/muen +MUEN_BUILD_DIR = $(BUILD_BASE_DIR)/kernel +MUEN_CONF_FILE = $(MUEN_BUILD_DIR)/muen.conf +MUEN_DST_DIR = $(MUEN_BUILD_DIR)/muen +MUEN_LOG = $(MUEN_BUILD_DIR)/build.log -MUEN_SYSTEM := $(shell sed -n "/^SYSTEM/s/^.*=\\s*//p" ${MUEN_CONF_FILE}) -MUEN_HARDWARE := $(shell sed -n "/^HARDWARE/s/^.*=\\s*//p" ${MUEN_CONF_FILE}) -MUEN_COMPONENTS := $(shell sed -n "/^COMPONENTS/s/^.*=\\s*//p" ${MUEN_CONF_FILE}) -GNAT_PATH := $(shell sed -n "/^GNAT_PATH/s/^.*=\\s*//p" ${MUEN_CONF_FILE}) -SPARK_PATH := $(shell sed -n "/^SPARK_PATH/s/^.*=\\s*//p" ${MUEN_CONF_FILE}) +MUEN_SYSTEM = $(shell sed -n "/^SYSTEM/s/^.*=\\s*//p" ${MUEN_CONF_FILE}) +MUEN_HARDWARE = $(shell sed -n "/^HARDWARE/s/^.*=\\s*//p" ${MUEN_CONF_FILE}) +MUEN_COMPONENTS = $(shell sed -n "/^COMPONENTS/s/^.*=\\s*//p" ${MUEN_CONF_FILE}) +GNAT_PATH = $(shell sed -n "/^GNAT_PATH/s/^.*=\\s*//p" ${MUEN_CONF_FILE}) +SPARK_PATH = $(shell sed -n "/^SPARK_PATH/s/^.*=\\s*//p" ${MUEN_CONF_FILE}) -BUILD_ENV = PATH=$(GNAT_PATH)/bin:$(SPARK_PATH)/bin:$$PATH -BUILD_OPTS = SYSTEM=$(MUEN_SYSTEM) HARDWARE=$(MUEN_HARDWARE) NO_PROOF=true +BUILD_ENV = PATH=$(GNAT_PATH)/bin:$(SPARK_PATH)/bin:$$PATH +BUILD_OPTS = SYSTEM=$(MUEN_SYSTEM) HARDWARE=$(MUEN_HARDWARE) NO_PROOF=true $(TARGET): $(MUEN_DST_DIR) $(MSG_BUILD)Muen kernel