Fix cross-compilation of build.rs for aarch64 target#607
Merged
mtjhrc merged 1 commit intocontainers:mainfrom Mar 31, 2026
Merged
Fix cross-compilation of build.rs for aarch64 target#607mtjhrc merged 1 commit intocontainers:mainfrom
mtjhrc merged 1 commit intocontainers:mainfrom
Conversation
aford173
requested review from
MatiasVara,
dorindabassey,
jakecorrenti,
mtjhrc,
slp and
tylerfanelli
as code owners
Collaborator
|
@aford173 thanks for the PR! please sign the commit to satisfy the DCO test. |
Build scripts may run on the host architecture, not the target. When
cross-compiling from x86_64 to aarch64, #[cfg(target_arch = "aarch64")]
evaluates to false in the build script, causing KRUN_EDK2_BINARY_PATH
to not be set at compile time:
error: environment variable `KRUN_EDK2_BINARY_PATH` not defined at compile time
--> src/vmm/src/builder.rs:104:44
|
104 | static EDK2_BINARY: &[u8] = include_bytes!(env!("KRUN_EDK2_BINARY_PATH"));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Use CARGO_CFG_TARGET_ARCH environment variable instead, which reflects
the actual target architecture regardless of the host.
Signed-off-by: Adam Ford <adam.ford@anodize.com>
aford173
force-pushed
the
fork/fix-cross-compile-build
branch
from
ca4cf4c to
0275772
Compare
Author
|
@slp - Sorry about that. It should be updated now. |
Collaborator
|
/gemini review |
![gemini-code-assist[bot]](https://avatars.githubusercontent.com/in/956858?s=60&v=4){kind=small}
There was a problem hiding this comment.
Code Review
This pull request updates the build script in src/vmm/build.rs to determine the target architecture using the CARGO_CFG_TARGET_ARCH environment variable instead of a compile-time configuration attribute. The review feedback suggests using the matches! macro to make the environment variable check more concise and idiomatic.
mtjhrc
approved these changes
Mar 31, 2026
Collaborator
mtjhrc
left a comment
mtjhrc
left a comment
There was a problem hiding this comment.
LGTM, verified to fix the issue. Thanks!
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Build scripts may run on the host architecture, not the target. When cross-compiling from x86_64 to aarch64, #[cfg(target_arch = "aarch64")] evaluates to false in the build script, causing KRUN_EDK2_BINARY_PATH to not be set at compile time:
error: environment variable
KRUN_EDK2_BINARY_PATHnot defined at compile time--> src/vmm/src/builder.rs:104:44
|
104 | static EDK2_BINARY: &[u8] = include_bytes!(env!("KRUN_EDK2_BINARY_PATH"));
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
Use CARGO_CFG_TARGET_ARCH environment variable instead, which reflects the actual target architecture regardless of the host.