Skip to content

Commit

Permalink
Default to v4.4, removing panic_immediate_abort feature when targetti…
Browse files Browse the repository at this point in the history
…ng v4.4+
  • Loading branch information
MabezDev committed Mar 30, 2022
1 parent 291170e commit d954428
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
3 changes: 2 additions & 1 deletion cargo/.cargo/config.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,10 @@ rustflags = ["-C", "default-linker-libraries"]
[unstable]
{% if std %}
build-std = ["std", "panic_abort"]{% else %}build-std = ["core", "alloc", "panic_abort"]{% endif %}
build-std-features = ["panic_immediate_abort"]
{% if espidfver != "v4.3.2" %}#{% endif %}build-std-features = ["panic_immediate_abort"] # required for older esp-idf versions without a realpath implementation

[env]
# Note: these variables are not used when using pio builder
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF stable (v4.4)
{% if espidfver != "v4.4" %}#{% endif %}ESP_IDF_VERSION = { value = "branch:release/v4.4" }
# Enables the esp-idf-sys "native" build feature (`cargo build --features native`) to build against ESP-IDF master (v5.0)
Expand Down
4 changes: 2 additions & 2 deletions cargo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ debug = true # Symbols are nice and they don't increase the size on Flash
opt-level = "z"

[features]
{% if espidfver <> 'v4.3.2' %}default = ["native"]
{% endif %}native = ["esp-idf-sys/native"]
{% if espidfver = 'v4.3.2' %}default = ["pio"]
{% endif %}pio = ["esp-idf-sys/pio"]

[dependencies]
{% if std %}esp-idf-sys = { version = "0.31", features = ["binstart"] }
Expand Down

0 comments on commit d954428

Please sign in to comment.