From ee6cc884546f9c94a274f86c6bc713be2890a6ea Mon Sep 17 00:00:00 2001 From: imarkov Date: Wed, 18 Aug 2021 10:53:23 +0300 Subject: [PATCH] Propagate sdkconfig tristate keys as Rustc cfg conditionals --- Cargo.toml | 8 ++++++-- build.rs | 13 +++++++++++-- 2 files changed, 17 insertions(+), 4 deletions(-) diff --git a/Cargo.toml b/Cargo.toml index 02b43145c..f63eadd84 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "esp-idf-hal" -version = "0.17.2" +version = "0.18.0" authors = ["sapir ", "Ivan Markov "] edition = "2018" categories = ["embedded", "hardware-support"] @@ -26,4 +26,8 @@ cfg-if = "1" nb = "0.1.2" mutex-trait = "0.2" embedded-hal = { version = "0.2", features = ["unproven"] } -esp-idf-sys = { version = "0.17", optional = true, default-features = false } +esp-idf-sys = { version = "0.18", optional = true, default-features = false } + +[build-dependencies] +cargo-pio = "0.21" +anyhow = "1" diff --git a/build.rs b/build.rs index a4f18732e..4af05c1fa 100644 --- a/build.rs +++ b/build.rs @@ -1,4 +1,7 @@ fn main() { + #[cfg(not(feature = "ulp"))] + pio::kconfig::CfgArgs::output_propagated("ESP_IDF")?; + #[cfg(not(feature = "ulp"))] let mcu = std::env::var("DEP_ESP_IDF_MCU").unwrap(); @@ -16,7 +19,13 @@ fn main() { println!("cargo:rustc-link-lib=static=ulp_start"); println!("cargo:rerun-if-changed=build.rs"); - println!("cargo:rerun-if-changed={}", ulp_dir.join("libulp_start.a").display()); - println!("cargo:rerun-if-changed={}", ulp_dir.join("ulp_link.x").display()); + println!( + "cargo:rerun-if-changed={}", + ulp_dir.join("libulp_start.a").display() + ); + println!( + "cargo:rerun-if-changed={}", + ulp_dir.join("ulp_link.x").display() + ); } }