ExternalVendorCode/genode
1
0
Fork 0
mirror of https://github.com/genodelabs/genode.git synced 2025-04-08 11:55:24 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

okl4: don't rely on BASE_DIR for vpath

Browse Source 
This patch is required to build the OKL4 version of core from a source
archive. It avoids fetching source codes from BASE_DIR, and moves the
vpath wildcard for %.cc after all specific vpath definitins, in
particular those that are x86-specific. Without the latter change, core
would always end up using the generic version of 'platform_services.cc',
omitting the IO_PORT service from core.
This commit is contained in:
Norman Feske 2017-04-07 18:29:08 +02:00 committed by Christian Helmuth
parent e2fb49ae39
commit ed64a9233e
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2,7 +2,8 @@ CC_OPT_PIC =
LIBS += okl4_boot_info base-okl4-common syscall-okl4 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_mem_alloc.cc \
@ -41,7 +42,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
@ -68,4 +69,3 @@ vpath dump_alloc.cc $(GEN_CORE_DIR)
vpath default_log.cc $(GEN_CORE_DIR)
vpath stack_area.cc $(GEN_CORE_DIR)
vpath pager_ep.cc $(GEN_CORE_DIR)
vpath %.cc $(REP_DIR)/src/core

2
repos/base-okl4/lib/mk/spec/x86/core-okl4.mk
View File

@ -10,3 +10,5 @@ vpath platform_services.cc $(GEN_CORE_DIR)/spec/x86
vpath platform_thread_x86.cc $(REP_DIR)/src/core/spec/x86
vpath crt0.s $(dir $(call select_from_repositories,src/lib/startup/spec/x86_32/crt0.s))
vpath %.cc $(REP_DIR)/src/core