[RSDK-9855] Repair project template cargo config and remove cruft #401
Conversation
| @@ -1,24 +1,17 @@ | |||
| [target.xtensa-esp32-espidf] | |||
| linker = "ldproxy" | |||
| runner = "espflash --monitor" | |||
| rustflags = ["-C", "default-linker-libraries", "-Clink-args=-Wl,-Map=./esp-build.map", "--cfg", "espidf_time32"] | |||
|
|
|||
| rustflags = ["--cfg", "espidf_time32"] | |||
There was a problem hiding this comment.
"-C", "default-linker-libraries" was never intended for application on xtensa targets, it was only to work around esp-rs/embuild#16 on riscv, which we don't currently support. If and when we do support it, the upstream issue may be resolved and we won't need it.
Also, the esp-build.map thing doesn't seem to get produced, at least for me. I'm going to double check that in a few different environments before committing to removing it, but if I can't get the file to be emitted I don't think we should have the flag.
There was a problem hiding this comment.
doesn't get produced for me either
|
|
||
| [target.xtensa-esp32s3-espidf] | ||
| linker = "ldproxy" | ||
| runner = "espflash --monitor" | ||
| rustflags = ["-C", "default-linker-libraries", "--cfg", "espidf_time32"] | ||
|
|
||
| [target.riscv32imc-esp-espidf] |
There was a problem hiding this comment.
We don't support riscv right now, so it doesn't make sense to me to carry around the block for configuring it.
| @@ -1,20 +0,0 @@ | |||
| [target.xtensa-esp32-espidf] | |||
There was a problem hiding this comment.
I removed this file because as far as I know, cargo doesn't consult .cargo/config.toml files from subdirectories of a workspace.
| @@ -1,19 +0,0 @@ | |||
| [target.xtensa-esp32-espidf] | |||
|
|
||
| [target.xtensa-esp32-espidf] | ||
| linker = "ldproxy" | ||
| runner = "espflash --monitor" | ||
| rustflags = ["--cfg", "espidf_time32"] |
There was a problem hiding this comment.
This espidf_time32 thing was needed on all platforms as long as we are on ESP-IDF 4, but in this file it was only being applied for the riscv target. It should be applied everywhere.
|
|
||
| [target.xtensa-esp32s3-espidf] | ||
| linker = "ldproxy" | ||
| runner = "espflash --monitor" | ||
|
|
||
| [target.riscv32imc-esp-espidf] |
There was a problem hiding this comment.
Removed because we don't support this target
| build-std = ["std", "panic_abort"] | ||
| #build-std-features = ["panic_immediate_abort"] # Required for older ESP-IDF versions without a realpath implementation |
I'll leave some comments to help clarify these changes.