From b20f96a055f109e4256be35b74490e1ab8cf30fe Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Tue, 28 Nov 2023 10:29:49 -0800 Subject: [PATCH 1/2] Allow overriding generated-src dir name --- variables.mk | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/variables.mk b/variables.mk index 62f8cf19..5abcba12 100644 --- a/variables.mk +++ b/variables.mk @@ -293,9 +293,10 @@ endif # build output directory for compilation ######################################################################################### # output for all project builds -gen_dir=$(sim_dir)/generated-src +generated_src_name ?= generated-src +gen_dir = $(sim_dir)/$(generated_src_dir_name) # per-project output directory -build_dir=$(gen_dir)/$(long_name) +build_dir = $(gen_dir)/$(long_name) # final generated collateral per-project GEN_COLLATERAL_DIR ?= $(build_dir)/gen-collateral From bd3a456f9277459e83382b7d45bf9da651bfacde Mon Sep 17 00:00:00 2001 From: Jerry Zhao Date: Tue, 28 Nov 2023 10:38:55 -0800 Subject: [PATCH 2/2] Fix generated_src_name make variable --- variables.mk | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/variables.mk b/variables.mk index 5abcba12..fcda57ef 100644 --- a/variables.mk +++ b/variables.mk @@ -293,12 +293,12 @@ endif # build output directory for compilation ######################################################################################### # output for all project builds -generated_src_name ?= generated-src -gen_dir = $(sim_dir)/$(generated_src_dir_name) +generated_src_name ?=generated-src +gen_dir =$(sim_dir)/$(generated_src_name) # per-project output directory -build_dir = $(gen_dir)/$(long_name) +build_dir =$(gen_dir)/$(long_name) # final generated collateral per-project -GEN_COLLATERAL_DIR ?= $(build_dir)/gen-collateral +GEN_COLLATERAL_DIR ?=$(build_dir)/gen-collateral ######################################################################################### # assembly/benchmark variables