ehmry/genode
ehmry
/
genode
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pistachio,fiasco: don't rely on BASE_DIR for vpath 

This patch corresponds to the patch "okl4: don't rely on BASE_DIR for
vpath", addressing the L4/Fiasco and L4ka::Pistachio kernels.
This commit is contained in:
Norman Feske 2017-04-18 15:56:31 +02:00 committed by Christian Helmuth
parent 50c53a23eb
commit 61551e4d76
4 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
repos/base-fiasco/lib/mk/core-fiasco.inc
View File

@ -1,4 +1,5 @@
GEN_CORE_DIR = $(BASE_DIR)/src/core
GEN_CORE_DIR := $(dir $(call select_from_repositories,src/core/main.cc))
GEN_SRC_DIR := $(realpath $(GEN_CORE_DIR)/..)
SRC_CC += stack_area.cc \
core_log.cc \
@ -40,7 +41,7 @@ SRC_CC += stack_area.cc \
INC_DIR += $(REP_DIR)/src/core/include \
$(GEN_CORE_DIR)/include \
$(REP_DIR)/src/include \
$(BASE_DIR)/src/include
$(GEN_SRC_DIR)/include
LIBS += base-fiasco-common syscall-fiasco cxx
@ -70,4 +71,3 @@ vpath default_log.cc $(GEN_CORE_DIR)
vpath dump_alloc.cc $(GEN_CORE_DIR)
vpath stack_area.cc $(GEN_CORE_DIR)
vpath pager_ep.cc $(GEN_CORE_DIR)
vpath %.cc $(REP_DIR)/src/core

1
repos/base-fiasco/lib/mk/spec/x86_32/core-fiasco.mk
View File

@ -7,3 +7,4 @@ vpath io_port_session_component.cc $(GEN_CORE_DIR)/spec/x86
vpath io_port_session_support.cc $(GEN_CORE_DIR)/spec/x86
vpath platform_services.cc $(GEN_CORE_DIR)/spec/x86
vpath platform_x86.cc $(REP_DIR)/src/core/spec/x86
vpath %.cc $(REP_DIR)/src/core

8
repos/base-pistachio/lib/mk/core-pistachio.inc
View File

@ -1,6 +1,7 @@
LIBS = base-pistachio-common syscall-pistachio cxx
LIBS = base-pistachio-common syscall-pistachio cxx
GEN_CORE_DIR = $(BASE_DIR)/src/core
GEN_CORE_DIR := $(dir $(call select_from_repositories,src/core/main.cc))
GEN_SRC_DIR := $(realpath $(GEN_CORE_DIR)/..)
SRC_CC = stack_area.cc \
core_log.cc \
@ -39,7 +40,7 @@ SRC_CC = stack_area.cc \
trace_session_component.cc
INC_DIR += $(REP_DIR)/src/core/include $(GEN_CORE_DIR)/include \
$(REP_DIR)/src/include $(BASE_DIR)/src/include
$(REP_DIR)/src/include $(GEN_SRC_DIR)/include
include $(GEN_CORE_DIR)/version.inc
@ -66,4 +67,3 @@ vpath core_rpc_cap_alloc.cc $(GEN_CORE_DIR)
vpath core_region_map.cc $(GEN_CORE_DIR)
vpath stack_area.cc $(GEN_CORE_DIR)
vpath pager_ep.cc $(GEN_CORE_DIR)
vpath %.cc $(REP_DIR)/src/core

1
repos/base-pistachio/lib/mk/spec/x86_32/core-pistachio.mk
View File

@ -8,3 +8,4 @@ vpath io_port_session_component.cc $(GEN_CORE_DIR)/spec/x86
vpath io_port_session_support.cc $(GEN_CORE_DIR)/spec/x86
vpath platform_services.cc $(GEN_CORE_DIR)/spec/x86
vpath platform_x86.cc $(REP_DIR)/src/core/spec/x86
vpath %.cc $(REP_DIR)/src/core