Commit 2725dac
authored
Fix invalid artifact directory when customizing target (#481)
# Objective
The Bevy CLI allows you to configure a custom compilation target in
`Cargo.toml`:
```toml
[package.metadata.bevy_cli.web]
target = "wasm32v1-none"
```
However, `bevy run web` doesn't work with this configuration, because it
searches for the Wasm binary in the `wasm32-unknown-unknown` target
folder.
# Solution
The cause of this problem is that we have to run the binary selection
_before_ loading the `Cargo.toml` config, to know which package to pull
the config from.
But the config can then alter the contents of the `BinTarget`, most
notably the `artifact_directory`.
As a fix, we run the bin target selection again after loading the
config, which fixes the problem.
# Testing
You can test via the [`no_std` package in the
bevy_complex_repo](https://github.com/TimJentzsch/bevy_complex_repo/tree/main/no_std).
It doesn't fully work yet, but at least it should compile now without an
error.1 parent febf8d2 commit 2725dac
3 files changed
+33
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
| 19 | + | |
| 20 | + | |
| 21 | + | |
| 22 | + | |
| 23 | + | |
| 24 | + | |
| 25 | + | |
| 26 | + | |
| 27 | + | |
| 28 | + | |
| 29 | + | |
| 30 | + | |
| 31 | + | |
| 32 | + | |
| 33 | + | |
| 34 | + | |
| 35 | + | |
19 | 36 | | |
20 | 37 | | |
21 | 38 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
33 | 33 | | |
34 | 34 | | |
35 | 35 | | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
36 | 43 | | |
37 | 44 | | |
38 | 45 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
16 | 16 | | |
17 | 17 | | |
18 | 18 | | |
19 | | - | |
| 19 | + | |
20 | 20 | | |
21 | 21 | | |
22 | 22 | | |
| |||
32 | 32 | | |
33 | 33 | | |
34 | 34 | | |
| 35 | + | |
| 36 | + | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
35 | 42 | | |
36 | 43 | | |
37 | 44 | | |
| |||
0 commit comments