diff options
| author |  bors[bot] <26634292+bors[bot]@users.noreply.github.com>
| 2020-10-22 11:10:57 +0000 |
|---|---|---|
| committer |  GitHub <noreply@github.com>
| 2020-10-22 11:10:57 +0000 |
| commit | 25f6613a6236d42d448d12b36557824a10ce7a77 (patch) | |
| tree | 68f8505188d28073430e155c5b6df9e0dd347654 | |
| parent | a6be5607611beb55e4509abb873fbac32fbdf612 (diff) | |
| parent | eefd67289e1610f06a4f3974645f0fd55b546899 (diff) | |
| download | cortex-m-25f6613a6236d42d448d12b36557824a10ce7a77.tar.gz cortex-m-25f6613a6236d42d448d12b36557824a10ce7a77.tar.zst cortex-m-25f6613a6236d42d448d12b36557824a10ce7a77.zip | |
Merge #273c-m-sh-v0.4.1
273: c-m-sh: fix missing prebuilt binaries. closes #271 r=adamgreig a=adamgreig
Adding a symlink to `../bin` allows `cargo package` to include a copy of the binary files in the resulting tarball, which means the build script is able to link them as normal.
* We include the `-lto.a` files, but don't have an LTO_PLUGIN feature and so never use them
* While this should work for all platforms to use from crates.io, it's not clear what e.g. Windows will do with the symlink when trying to use this as a path/patch dependency directly from the git repository.
If it seems useful I could probably add a LTO feature the same as cortex-m, but I'd rather wait until we can have c-m-sh just directly use cortex-m's `syscall` method and then users can enable that feature in cortex-m themselves instead.
If anyone has this set up on Windows and is able to see if you can still use this repository as a path dependency, that would be great!
Co-authored-by: Adam Greig <adam@adamgreig.com>
| -rw-r--r-- | cortex-m-semihosting/CHANGELOG.md | 7 | ||||
| -rw-r--r-- | cortex-m-semihosting/Cargo.toml | 2 | ||||
| l--------- | cortex-m-semihosting/bin | 1 | ||||
| -rw-r--r-- | cortex-m-semihosting/build.rs | 2 |
4 files changed, 9 insertions, 3 deletions
diff --git a/cortex-m-semihosting/CHANGELOG.md b/cortex-m-semihosting/CHANGELOG.md index 0abe647..25ee2b0 100644 --- a/cortex-m-semihosting/CHANGELOG.md +++ b/cortex-m-semihosting/CHANGELOG.md @@ -5,6 +5,10 @@ This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased] +## [v0.4.1] - 2020-10-20 + +- Fix missing prebuilt binaries (#271) + ## [v0.4.0] - 2020-10-14 - Moved into cortex-m repository @@ -115,7 +119,8 @@ This project adheres to [Semantic Versioning](http://semver.org/). - Initial release -[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/c-m-sh-v0.4.0...HEAD +[Unreleased]: https://github.com/rust-embedded/cortex-m/compare/c-m-sh-v0.4.1...HEAD +[v0.4.1]: https://github.com/rust-embedded/cortex-m/compare/c-m-sh-v0.4.0...c-m-sh-v0.4.1 [v0.4.0]: https://github.com/rust-embedded/cortex-m/compare/c-m-sh-v0.3.5...c-m-sh-v0.4.0 [v0.3.5]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.4...v0.3.5 [v0.3.4]: https://github.com/rust-embedded/cortex-m-semihosting/compare/v0.3.3...v0.3.4 diff --git a/cortex-m-semihosting/Cargo.toml b/cortex-m-semihosting/Cargo.toml index 368e0f1..c6204eb 100644 --- a/cortex-m-semihosting/Cargo.toml +++ b/cortex-m-semihosting/Cargo.toml @@ -10,7 +10,7 @@ license = "MIT OR Apache-2.0" name = "cortex-m-semihosting" readme = "README.md" repository = "https://github.com/rust-embedded/cortex-m" -version = "0.4.0" +version = "0.4.1" edition = "2018" [features] diff --git a/cortex-m-semihosting/bin b/cortex-m-semihosting/bin new file mode 120000 index 0000000..19f285a --- /dev/null +++ b/cortex-m-semihosting/bin @@ -0,0 +1 @@ +../bin
\ No newline at end of file diff --git a/cortex-m-semihosting/build.rs b/cortex-m-semihosting/build.rs index 5fc6a04..315035e 100644 --- a/cortex-m-semihosting/build.rs +++ b/cortex-m-semihosting/build.rs @@ -9,7 +9,7 @@ fn main() { if target.starts_with("thumbv") { if env::var_os("CARGO_FEATURE_INLINE_ASM").is_none() { fs::copy( - format!("../bin/{}.a", target), + format!("bin/{}.a", target), out_dir.join(format!("lib{}.a", name)), ) .unwrap(); |