target: Improve Makefile reusability for use in Occamy

pulp-platform · Sep 4, 2024 · 2e29bca · 2e29bca
1 parent ee1e521
commit 2e29bca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git 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
@@ -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 #