Skip to content

Commit 55928a6

Browse files
authored
fix: Update cargo's config to use the new linker parameter (#100)
Since rust v1.74, the linker can be selected without using rustflags. This plays nicer with `RUSTFLAGS`.
1 parent 2e15359 commit 55928a6

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

.cargo/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
runner = "probe-rs run --chip RP2040 --protocol swd"
66
# runner = "elf2uf2-rs -d"
77

8+
linker = "flip-link"
89
rustflags = [
9-
"-C", "linker=flip-link",
1010
"-C", "link-arg=--nmagic",
1111
"-C", "link-arg=-Tlink.x",
1212
"-C", "link-arg=-Tdefmt.x",

cargo-generate/config.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,8 @@
1515
runner = "{{ flash_method_custom }}"
1616
{%- endif -%}
1717
{%- endcase %}
18+
linker = "flip-link"
1819
rustflags = [
19-
"-C", "linker=flip-link",
2020
"-C", "link-arg=--nmagic",
2121
"-C", "link-arg=-Tlink.x",
2222
"-C", "link-arg=-Tdefmt.x",

0 commit comments

Comments
 (0)