about summary refs log tree commit diff
path: root/library/panic_unwind/src
diff options
context:
space:
mode:
authorivmarkov <ivan.markov@gmail.com>2021-07-29 20:18:22 +0300
committerivmarkov <imarkov@vmware.com>2021-08-10 12:09:00 +0300
commit459eaa6baea4127b37769d0b7944fa00c175e770 (patch)
tree100c65b39f217096a01f3c0f256a672bfeaacd42 /library/panic_unwind/src
parentae90dcf0207c57c3034f00b07048d63f8b2363c8 (diff)
downloadrust-459eaa6baea4127b37769d0b7944fa00c175e770.tar.gz
rust-459eaa6baea4127b37769d0b7944fa00c175e770.zip
STD support for the ESP-IDF framework
Diffstat (limited to 'library/panic_unwind/src')
-rw-r--r--library/panic_unwind/src/lib.rs3
1 files changed, 2 insertions, 1 deletions
diff --git a/library/panic_unwind/src/lib.rs b/library/panic_unwind/src/lib.rs
index 14b454da4f4..ac7d8c18e3e 100644
--- a/library/panic_unwind/src/lib.rs
+++ b/library/panic_unwind/src/lib.rs
@@ -45,7 +45,7 @@ cfg_if::cfg_if! {
     } else if #[cfg(any(
         all(target_family = "windows", target_env = "gnu"),
         target_os = "psp",
-        target_family = "unix",
+        all(target_family = "unix", not(target_os = "espidf")),
         all(target_vendor = "fortanix", target_env = "sgx"),
     ))] {
         // Rust runtime's startup objects depend on these symbols, so make them public.
@@ -58,6 +58,7 @@ cfg_if::cfg_if! {
         // - arch=wasm32
         // - os=none ("bare metal" targets)
         // - os=uefi
+        // - os=espidf
         // - nvptx64-nvidia-cuda
         // - arch=avr
         #[path = "dummy.rs"]