Skip to content

Commit

Permalink
chore: make CARGO_PRESHELL a list variable (ariel-os#842)
Browse files Browse the repository at this point in the history
  • Loading branch information
chrysn authored Feb 20, 2025
2 parents d2b093e + 72246a1 commit 0860e95
Showing 1 changed file with 7 additions and 2 deletions.
9 changes: 7 additions & 2 deletions laze-project.yml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ contexts:
CARGO:
- ${CARGO_WRAPPER}
- cargo
CARGO_PRESHELL: true &&

tasks:
info-modules:
Expand Down Expand Up @@ -59,6 +58,7 @@ contexts:
-semihosting-config enable=on,target=native
-kernel
PROBE_RS_PROTOCOL: swd
CARGO_PRESHELL: []

var_options:
# this turns ${FEATURES} from a list to "--features=feature1,feature2"
Expand All @@ -67,6 +67,11 @@ contexts:
joiner: ","
LOG:
joiner: ","
CARGO_PRESHELL:
# List of extra commands to be executed by the shell that runs cargo before cargo is run.
#
# This is typically used to source additional shell scripts that set up extra environment.
suffix: " && "

# this prefixes `--protocol=` to `PROBE_RS_PROTOCOL`
PROBE_RS_PROTOCOL:
Expand Down Expand Up @@ -496,7 +501,7 @@ modules:
# Note that one \ escapes for YAML, the reaming \ escapes for laze,
# and the second $ escapes for laze's internal ninja, resulting in
# the shell to see just ${ESPUP_...
- . $\\${ESPUP_EXPORT_FILE:-~/export-esp.sh} &&
- . $\\${ESPUP_EXPORT_FILE:-~/export-esp.sh}

- name: riscv
env:
Expand Down

0 comments on commit 0860e95

Please sign in to comment.