Skip to content

Commit

Permalink
Remove -C default-linker-libraries
Browse files Browse the repository at this point in the history
  • Loading branch information
taks committed Jan 8, 2025
1 parent eebecac commit da83fbc
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 12 deletions.
15 changes: 7 additions & 8 deletions .cargo/config.toml
Original file line number Diff line number Diff line change
@@ -1,38 +1,37 @@
[build]
# Uncomment the relevant target for your chip here (ESP32, ESP32-S2, ESP32-S3 or ESP32-C3)
target = "xtensa-esp32-espidf"
#target = "xtensa-esp32-espidf"
#target = "xtensa-esp32s2-espidf"
#target = "xtensa-esp32s3-espidf"
#target = "riscv32imc-esp-espidf"
target = "riscv32imc-esp-espidf"

[target.xtensa-esp32-espidf]
linker = "ldproxy"
runner = "espflash --monitor"
rustflags = ["--cfg", "espidf_time64"] # Extending time_t for ESP IDF 5: https://github.com/esp-rs/rust/issues/110
rustflags = ["--cfg", "espidf_time64"]

[target.xtensa-esp32s2-espidf]
linker = "ldproxy"
runner = "espflash --monitor"
rustflags = ["--cfg", "espidf_time64"] # Extending time_t for ESP IDF 5: https://github.com/esp-rs/rust/issues/110
rustflags = ["--cfg", "espidf_time64"]

[target.xtensa-esp32s3-espidf]
linker = "ldproxy"
runner = "espflash --monitor"
rustflags = ["--cfg", "espidf_time64"] # Extending time_t for ESP IDF 5: https://github.com/esp-rs/rust/issues/110
rustflags = ["--cfg", "espidf_time64"]

[target.riscv32imc-esp-espidf]
linker = "ldproxy"
runner = "espflash flash --monitor"
rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"]
rustflags = ["--cfg", "espidf_time64"]

[target.riscv32imac-esp-espidf]
linker = "ldproxy"
runner = "espflash flash --monitor"
rustflags = ["--cfg", "espidf_time64", "-C", "default-linker-libraries"]
rustflags = ["--cfg", "espidf_time64"]

[unstable]
build-std = ["std", "panic_abort"]
#build-std-features = ["panic_immediate_abort"] # Required for older ESP-IDF versions without a realpath implementation

[env]
ESP_IDF_VERSION = "v5.3.2"
8 changes: 4 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -21,17 +21,17 @@ jobs:
include:
- target: riscv32imc-esp-espidf
idf-version: v5.1.3
rustflags: "-C default-linker-libraries --cfg espidf_time64"
rustflags: "--cfg espidf_time64"
ble5-example: true
- target: riscv32imc-esp-espidf
idf-version: v5.2.1
rustflags: "-C default-linker-libraries --cfg espidf_time64"
rustflags: " --cfg espidf_time64"
- target: riscv32imc-esp-espidf
idf-version: v5.3.2
rustflags: "-C default-linker-libraries --cfg espidf_time64"
rustflags: " --cfg espidf_time64"
- target: riscv32imac-esp-espidf
idf-version: v5.1.3
rustflags: "-C default-linker-libraries --cfg espidf_time64"
rustflags: "--cfg espidf_time64"
mcu: esp32c6
- target: xtensa-esp32-espidf
idf-version: v5.1.3
Expand Down

0 comments on commit da83fbc

Please # to comment.