diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2022-09-28 18:49:50 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-28 18:49:50 +0000 |
| commit | a79cc083803d126d90d1bb28af61dc6b168a0d41 (patch) | |
| tree | 4c242a8a2ff99c78e1400fe0d2f7adbc462a9e01 /.cargo/config.toml | |
| parent | 0539c3ca1a5e2d8ec3409e519c375ae4cef56341 (diff) | |
| parent | ea6f824ad2fc02a21383e86baeaa7372ee9909e0 (diff) | |
Merge #660
660: Clarify r=AfoHT a=01joja
I made 3 suggested changes
- `.cargo/config` -> `.cargo/config.toml`. Now extensions for vs code recognizes that it is a toml-file.
- Moved a note about how to configure target in cargo.toml to by-example.md from app_init.md.
- changed all occurrences of `.cargo/config` to `.cargo/config.toml` in the ru and eng version of the book.
Co-authored-by: Jonas Jacobsson <01joja@gmail.com>
Diffstat (limited to '.cargo/config.toml')
| -rw-r--r-- | .cargo/config.toml | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/.cargo/config.toml b/.cargo/config.toml new file mode 100644 index 0000000..d70faef --- /dev/null +++ b/.cargo/config.toml @@ -0,0 +1,13 @@ +[alias] +xtask = "run --package xtask --" + +[target.thumbv6m-none-eabi] +runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel" + +[target.thumbv7m-none-eabi] +runner = "qemu-system-arm -cpu cortex-m3 -machine lm3s6965evb -nographic -semihosting-config enable=on,target=native -kernel" + +[target.'cfg(all(target_arch = "arm", target_os = "none"))'] +rustflags = [ + "-C", "link-arg=-Tlink.x", +]
\ No newline at end of file |