From 0cf164035ce87802fd549753286cb06443123fe7 Mon Sep 17 00:00:00 2001
From: Luca Colagrande <luca.colagrande3@gmail.com>
Date: Wed, 4 Sep 2024 18:59:59 +0200
Subject: [PATCH] target: Improve Makefile reusability for use in Occamy

---
 target/snitch_cluster/sw/apps/common.mk     | 2 +-
 target/snitch_cluster/sw/runtime/runtime.mk | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/target/snitch_cluster/sw/apps/common.mk b/target/snitch_cluster/sw/apps/common.mk
index 1231d93ee..7262cb38c 100644
--- a/target/snitch_cluster/sw/apps/common.mk
+++ b/target/snitch_cluster/sw/apps/common.mk
@@ -33,7 +33,7 @@ $(APP)_RISCV_LDFLAGS += -T$(BASE_LD)
 $(APP)_RISCV_LDFLAGS += $(addprefix -L,$($(APP)_LIBDIRS))
 $(APP)_RISCV_LDFLAGS += $(addprefix -l,$($(APP)_LIBNAMES))
 
-LD_DEPS = $(MEMORY_LD) $(BASE_LD) $($(APP)_LIBS)
+LD_DEPS += $(MEMORY_LD) $(BASE_LD) $($(APP)_LIBS)
 
 ###########
 # Outputs #
diff --git a/target/snitch_cluster/sw/runtime/runtime.mk b/target/snitch_cluster/sw/runtime/runtime.mk
index c7a22ab66..30ef2bc25 100644
--- a/target/snitch_cluster/sw/runtime/runtime.mk
+++ b/target/snitch_cluster/sw/runtime/runtime.mk
@@ -8,10 +8,10 @@
 # Directories #
 ###############
 
-SNRT_DIR        = $(SNITCH_ROOT)/sw/snRuntime
-SNRT_TARGET_DIR = $(SNITCH_ROOT)/target/snitch_cluster/sw/runtime/$(SELECT_RUNTIME)
-SNRT_BUILDDIR   = $(SNRT_TARGET_DIR)/build
-SNRT_SRCDIR     = $(SNRT_TARGET_DIR)/src
+SNRT_DIR         = $(SNITCH_ROOT)/sw/snRuntime
+SNRT_TARGET_DIR ?= $(SNITCH_ROOT)/target/snitch_cluster/sw/runtime/$(SELECT_RUNTIME)
+SNRT_BUILDDIR    = $(SNRT_TARGET_DIR)/build
+SNRT_SRCDIR      = $(SNRT_TARGET_DIR)/src
 
 ###################
 # Build variables #