File tree Expand file tree Collapse file tree 3 files changed +13
-13
lines changed Expand file tree Collapse file tree 3 files changed +13
-13
lines changed Original file line number Diff line number Diff line change @@ -133,15 +133,15 @@ optimizing the program. Let's check that.
133
133
134
134
> ** PROTIP** You can set ` target.thumbv7m-none-eabi.runner ` to the long QEMU
135
135
> command from before (` qemu-system-arm -cpu (..) -kernel ` ) in the Cargo
136
- > configuration file (` .cargo/conifg ` ) to have ` cargo run ` use that * runner* to
136
+ > configuration file (` .cargo/conifg.toml ` ) to have ` cargo run ` use that * runner* to
137
137
> execute the output binary.
138
138
139
139
``` console
140
- $ head -n2 .cargo/config
140
+ $ head -n2 .cargo/config.toml
141
141
```
142
142
143
143
``` toml
144
- {{#include ../ci/logging/app/.cargo/config:1:2}}
144
+ {{#include ../ci/logging/app/.cargo/config.toml :1:2}}
145
145
```
146
146
147
147
``` console
@@ -217,11 +217,11 @@ Before you run this you'll have to append `-Tlog.x` to the arguments passed to
217
217
the linker. That can be done in the Cargo configuration file.
218
218
219
219
``` console
220
- $ cat .cargo/config
220
+ $ cat .cargo/config.toml
221
221
```
222
222
223
223
``` toml
224
- {{#include ../ci/logging/app2/.cargo/config}}
224
+ {{#include ../ci/logging/app2/.cargo/config.toml }}
225
225
```
226
226
227
227
Now you can run it! Since the output now has a binary format we'll pipe it
Original file line number Diff line number Diff line change @@ -174,7 +174,7 @@ We have to tweak the linker process to make it use our linker script. This is do
174
174
passing the ` -C link-arg ` flag to ` rustc ` . This can be done with ` cargo-rustc ` or
175
175
` cargo-build ` .
176
176
177
- ** IMPORTANT** : Make sure you have the ` .cargo/config ` file that was added at the
177
+ ** IMPORTANT** : Make sure you have the ` .cargo/config.toml ` file that was added at the
178
178
end of the last section before running this command.
179
179
180
180
Using the ` cargo-rustc ` subcommand:
@@ -183,17 +183,17 @@ Using the `cargo-rustc` subcommand:
183
183
$ cargo rustc -- -C link-arg=-Tlink.x
184
184
```
185
185
186
- Or you can set the rustflags in ` .cargo/config ` and continue using the
186
+ Or you can set the rustflags in ` .cargo/config.toml ` and continue using the
187
187
` cargo-build ` subcommand. We'll do the latter because it better integrates with
188
188
` cargo-binutils ` .
189
189
190
190
``` console
191
- # modify .cargo/config so it has these contents
192
- $ cat .cargo/config
191
+ # modify .cargo/config.toml so it has these contents
192
+ $ cat .cargo/config.toml
193
193
```
194
194
195
195
``` toml
196
- {{#include ../ci/memory-layout/.cargo/config}}
196
+ {{#include ../ci/memory-layout/.cargo/config.toml }}
197
197
```
198
198
199
199
The ` [target.thumbv7m-none-eabi] ` part says that these flags will only be used
Original file line number Diff line number Diff line change @@ -98,12 +98,12 @@ Cargo invocation.
98
98
``` console
99
99
$ mkdir .cargo
100
100
101
- $ # modify .cargo/config so it has these contents
102
- $ cat .cargo/config
101
+ $ # modify .cargo/config.toml so it has these contents
102
+ $ cat .cargo/config.toml
103
103
```
104
104
105
105
``` toml
106
- {{#include ../ci/smallest-no-std/.cargo/config}}
106
+ {{#include ../ci/smallest-no-std/.cargo/config.toml }}
107
107
```
108
108
109
109
## eh_personality
You can’t perform that action at this time.
0 commit comments