mock_area: fix syntax error

Signed-off-by: Øyvind Harboe <[email protected]>
The-OpenROAD-Project · Sep 15, 2024 · 35e9a78 · 35e9a78
1 parent 8c0124c
commit 35e9a78
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/make.tpl b/make.tpl
@@ -24,7 +24,9 @@ else
   fi
   export MAKE_PATH="$(command -v make)"
 fi
-if [[ -f "${EXTRA_ENVS}" ]]; then
+
+if [ -n "${EXTRA_ENVS}" ] && [ -f "${EXTRA_ENVS}" ]; then
   source "${EXTRA_ENVS}"
 fi
+
 exec $MAKE_PATH --file "$FLOW_HOME/Makefile" "$@"
diff --git a/openroad.bzl b/openroad.bzl
@@ -396,12 +396,16 @@ def yosys_substitutions(ctx):
         "${OPENROAD_PATH}": "",
     }
 
+default_substitutions = {
+    "${EXTRA_ENVS}": "",
+}
+
 def _deps_impl(ctx):
     exe = _declare_artifact(ctx, "results", ctx.attr.name + ".sh")
     ctx.actions.expand_template(
         template = ctx.file._deploy_template,
         output = exe,
-        substitutions = {
+        substitutions = default_substitutions | default_substitutions | {
             "${GENFILES}": " ".join([f.short_path for f in ctx.attr.src[OrfsDepInfo].files]),
             "${CONFIG}": ctx.attr.src[OrfsDepInfo].config.short_path,
             "${MAKE}": ctx.attr.src[OrfsDepInfo].make.short_path,
@@ -731,14 +735,14 @@ def _yosys_impl(ctx):
     ctx.actions.expand_template(
         template = ctx.file._make_template,
         output = make,
-        substitutions = flow_substitutions(ctx) | yosys_substitutions(ctx) | {'"$@"': 'WORK_HOME="./{}" DESIGN_CONFIG="config.mk" "$@"'.format(ctx.label.package)},
+        substitutions = default_substitutions | flow_substitutions(ctx) | yosys_substitutions(ctx) | {'"$@"': 'WORK_HOME="./{}" DESIGN_CONFIG="config.mk" "$@"'.format(ctx.label.package)},
     )
 
     exe = ctx.actions.declare_file(ctx.attr.name + ".sh")
     ctx.actions.expand_template(
         template = ctx.file._deploy_template,
         output = exe,
-        substitutions = {
+        substitutions = default_substitutions | {
             "${GENFILES}": " ".join([f.short_path for f in synth_outputs + [config_short] + canon_logs + synth_logs]),
             "${CONFIG}": config_short.short_path,
             "${MAKE}": make.short_path,
@@ -926,14 +930,14 @@ def _make_impl(ctx, stage, steps, forwarded_names = [], result_names = [], objec
     ctx.actions.expand_template(
         template = ctx.file._make_template,
         output = make,
-        substitutions = flow_substitutions(ctx) | openroad_substitutions(ctx) | extra_envs_args | {'"$@"': 'WORK_HOME="./{}" DESIGN_CONFIG="config.mk" "$@"'.format(ctx.label.package)},
+        substitutions = default_substitutions | flow_substitutions(ctx) | openroad_substitutions(ctx) | extra_envs_args | {'"$@"': 'WORK_HOME="./{}" DESIGN_CONFIG="config.mk" "$@"'.format(ctx.label.package)},
     )
 
     exe = ctx.actions.declare_file(ctx.attr.name + ".sh")
     ctx.actions.expand_template(
         template = ctx.file._deploy_template,
         output = exe,
-        substitutions = {
+        substitutions = default_substitutions | {
             "${GENFILES}": " ".join([f.short_path for f in [config_short] + results + logs + reports + ctx.files.data + extra_envs_deps]),
             "${CONFIG}": config_short.short_path,
             "${MAKE}": make.short_path,