From da294cb02a60f1b13b49b434198451dc935e1c22 Mon Sep 17 00:00:00 2001 From: Norman Feske Date: Fri, 31 Mar 2017 11:54:25 +0200 Subject: [PATCH] mk: obtain 'genode.ld' always form BASE_DIR This way, the base repository does not need to be present in the 'REPOSITORIES' list when building static executables. --- repos/base-linux/src/core/linux/target.mk | 2 +- repos/base/mk/prg.mk | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repos/base-linux/src/core/linux/target.mk b/repos/base-linux/src/core/linux/target.mk index 6e0985bda..83999db0b 100644 --- a/repos/base-linux/src/core/linux/target.mk +++ b/repos/base-linux/src/core/linux/target.mk @@ -39,7 +39,7 @@ INC_DIR += $(REP_DIR)/src/core/include \ $(BASE_DIR)/src/include LD_TEXT_ADDR ?= 0x01000000 -LD_SCRIPT_STATIC = $(call select_from_repositories,src/ld/genode.ld) \ +LD_SCRIPT_STATIC = $(BASE_DIR)/src/ld/genode.ld \ $(call select_from_repositories,src/ld/stack_area.nostdlib.ld) include $(GEN_CORE_DIR)/version.inc diff --git a/repos/base/mk/prg.mk b/repos/base/mk/prg.mk index 859cc4c3a..9948b9abd 100644 --- a/repos/base/mk/prg.mk +++ b/repos/base/mk/prg.mk @@ -62,7 +62,7 @@ CXX_LINK_OPT += $(CC_MARCH) # # Generic linker script for statically linked binaries # -LD_SCRIPT_STATIC ?= $(call select_from_repositories,src/ld/genode.ld) +LD_SCRIPT_STATIC ?= $(BASE_DIR)/src/ld/genode.ld include $(BASE_DIR)/mk/generic.mk include $(BASE_DIR)/mk/base-libs.mk