Add cross-compilation logic for Mbed Crypto #61
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
When compiling the service with `cargo build --target aarch64-unknown-linux-gnu` Mbed Crypto should also be compiled for the same target and all object files should be linked together for that target. This commit adds the necessary logic to achieve that. Signed-off-by: Hugues de Valon <hugues.devalon@arm.com>
ionut-arm
reviewed
Oct 29, 2019
| @@ -70,45 +81,66 @@ fn setup_mbed_crypto(mbed_config: &MbedConfig) { | |||
| let metadata = package | |||
| .metadata | |||
| .expect("Cargo.toml does not contain package metadata."); | |||
| let plasma_config = get_value_from_table(&metadata, CONFIG_TABLE_NAME); | |||
There was a problem hiding this comment.
Wow, 'plasma' was still a thing. 😮
ionut-arm
reviewed
Oct 30, 2019
| project_dir | ||
| ); | ||
| println!("cargo:rustc-link-lib=static=mbedcrypto"); | ||
| println!("cargo:rerun-if-changed={}", header); |
ionut-arm
approved these changes
Oct 30, 2019
| toolchain = mbed_config.aarch64_unknown_linux_gnu.as_ref().unwrap(); | ||
| mbed_compiler = toolchain | ||
| .mbed_compiler | ||
| .clone() |
There was a problem hiding this comment.
Do you need to clone here? Since you only use the value in an if-else, you should be able to just extract it out of toolchain
There was a problem hiding this comment.
If I remove the clone I have the following error:
error[E0507]: cannot move out of `toolchain.mbed_compiler` which is behind a shared reference
--> build.rs:95:25
|
95 | mbed_compiler = toolchain
| _________________________^
96 | | .mbed_compiler
| |__________________________^ move occurs because `toolchain.mbed_compiler` has type `std::option::Option<std::string::String>`, which does not implement the `Copy` trait
help: consider borrowing the `Option`'s content
|
95 | mbed_compiler = toolchain
96 | .mbed_compiler.as_ref()
|
If I use as_ref however then in the unwrap_or I have on one side a &String and one the other a &str. I did not find a good way to convert both to the same type so I just assumed using clone was acceptable here because of that 😃
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When compiling the service with
cargo build --target aarch64-unknown-linux-gnuMbed Crypto should also be compiled for the same target and all object
files should be linked together for that target. This commit adds the
necessary logic to achieve that.