Read target architecture from cross-compiled binaries. #822
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
Alexhuszagh
added
enhancement
meta
|
I also removed the |
Emilgardis
requested changes
Jun 18, 2022
xtask/src/readelf.rs
Outdated
Comment on lines
88
to
105
| println!("{{"); | ||
| for (key, value) in lines { | ||
| let value = value.trim_matches('"'); | ||
| println!(" \"{key}\": \"{value}\"",); | ||
| } | ||
| println!("}}"); | ||
| } |
There was a problem hiding this comment.
same spirit as #818, can you store this in a struct/serde_json::Value, make the function return the struct and make the print in the readelf function
xtask/src/readelf.rs
Outdated
Comment on lines
60
to
68
|
|
||
| if !verbose { | ||
| // capture stderr to avoid polluting table | ||
| command.stderr(Stdio::null()); | ||
| } | ||
| let stdout = command.run_and_get_stdout(verbose)?; | ||
| let trimmed = stdout.trim(); | ||
| if trimmed.is_empty() { | ||
| eprintln!("no target information: target is likely same architecture as host."); |
There was a problem hiding this comment.
Suggested change
| if !verbose { | |
| // capture stderr to avoid polluting table | |
| command.stderr(Stdio::null()); | |
| } | |
| let stdout = command.run_and_get_stdout(verbose)?; | |
| let trimmed = stdout.trim(); | |
| if trimmed.is_empty() { | |
| eprintln!("no target information: target is likely same architecture as host."); | |
| let out = command.run_and_get_output(verbose)?; | |
| let stdout = out.stdout()?; | |
| if stdout.trim().is_empty() { | |
| let stderr = out.stderr()?; | |
| if !stderr.trim().is_empty() { | |
| if stderr.contains("target may not be installed") { | |
| eprintln!("warning: target {target} is not installed"); | |
| return Ok(()); | |
| } else if !stderr.contains("Finished dev") { | |
| eprintln!("{}", stderr.header("stderr")); | |
| return Ok(()); | |
| } | |
| } | |
| eprintln!("no target information: target `{target}` is likely same architecture as host."); | |
| if verbose { | |
| eprintln!("{}", stderr.header("stderr")); | |
| } |
There was a problem hiding this comment.
uses color_eyre::SectionExt to output it nicely
xtask/src/readelf.sh
Outdated
Comment on lines
12
to
15
| cargo init --bin hello >/dev/null | ||
| cd hello | ||
| cargo build --target "${TARGET}" "${@}" >/dev/null | ||
| readelf -A "target/${TARGET}/debug/hello" |
There was a problem hiding this comment.
Suggested change
| cargo init --bin hello >/dev/null | |
| cd hello | |
| cargo build --target "${TARGET}" "${@}" >/dev/null | |
| readelf -A "target/${TARGET}/debug/hello" | |
| cargo init --bin hello 1>&2 | |
| cd hello | |
| cargo build --target "${TARGET}" "${@}" 1>&2 | |
| readelf -A "target/${TARGET}/debug/hello" |
xtask/src/util.rs
Outdated
Comment on lines
91
to
96
| if !verbose { | ||
| // capture output to avoid polluting table | ||
| command.stdout(Stdio::null()); | ||
| command.stderr(Stdio::null()); | ||
| } | ||
| command.run(verbose, false).map_err(Into::into) |
There was a problem hiding this comment.
I know this is old but I think this should be changed to
Suggested change
| if !verbose { | |
| // capture output to avoid polluting table | |
| command.stdout(Stdio::null()); | |
| command.stderr(Stdio::null()); | |
| } | |
| command.run(verbose, false).map_err(Into::into) | |
| let out = command.run_and_get_output(verbose)?; | |
| command.status_result(verbose, out.status, Some(&out))?; | |
| Ok(()) |
Use `readelf -A` on generated binaries to read the target architecture information and output the data as JSON, simplifying verifying that new targets produce code for the desired architecture. Closes cross-rs#821. Related to cross-rs#426.
|
This actually needs to install the target architecture via rustup if it's not present. |
|
yup, I don't know if maybe it makes sense to do it only when wanted, eg |
|
Actually this might be more difficult than I thought. MIPS is giving me some very weird data. Probably will close this. You can submit the other changes as a separate PR. |
bors bot
added a commit
that referenced
this pull request
Jun 19, 2022
824: Minor xtask restructuring. r=Emilgardis a=Alexhuszagh Remove the `-it` flag from `target-info`, which can the command to not complete. Also changes `pull_image` to use `run_and_get_output` rather than `run`, which is how we should capture the output. Finally, it moves `format_repo` and `pull_image` to `util`, so they can be used by other commands. This applies a few of the changes mentioned in #822. Co-authored-by: Alex Huszagh <ahuszagh@gmail.com>
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.
Use
readelf -Aon generated binaries to read the target architecture information and output the data as JSON, simplifying verifying that new targets produce code for the desired architecture.Closes #821.
Related to #426.