8000 fix(xtask): misc by mkroening · Pull Request #980 · hermit-os/kernel · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

fix(xtask): misc #980

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Nov 16, 2023
Merged

fix(xtask): misc #980

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
96b4adf
ci: fix publish_docs
mkroening Nov 15, 2023
84ea5ac
refactor(xtask): `Arch::install`
mkroening Nov 15, 2023
3d50316
fix(xtask): document riscv64 rustup constraint
mkroening Nov 15, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions .github/workflows/publish_docs.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ jobs:
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Rustup (apply rust-toolchain.toml)
run: rustup show
- uses: mkroening/rust-toolchain-toml@main
- run: rustup target add x86_64-unknown-none
- name: Generate documentation
run: cargo doc --target x86_64-unknown-none --package hermit-kernel
- name: Generate index.html
Expand Down
16 changes: 7 additions & 9 deletions xtask/src/arch.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,11 @@ pub enum Arch {

impl Arch {
pub fn install(&self) -> Result<()> {
eprintln!("Installing target");
let sh = crate::sh()?;
match self {
Self::X86_64 => {
let triple = self.triple();
cmd!(sh, "rustup target add {triple}").run()?;
}
Self::Aarch64 => {}
Self::Riscv64 => {}
if self == &Self::X86_64 {
eprintln!("Installing target");
let triple = self.triple();
cmd!(sh, "rustup target add {triple}").run()?;
}
Ok(())
}
Expand Down Expand Up @@ -78,13 +74,15 @@ impl Arch {
Self::X86_64 => &["--target=x86_64-unknown-none"],
Self::Aarch64 => &[
"--target=aarch64-unknown-none-softfloat",
// We can't use prebuilt std for aarch64 because it is built with
// We can't use prebuilt std here because it is built with
// relocation-model=static and we need relocation-model=pic
"-Zbuild-std=core,alloc",
"-Zbuild-std-features=compiler-builtins-mem",
],
Self::Riscv64 => &[
"--target=riscv64gc-unknown-none-elf",
// We can't use prebuilt std here because it is built with
// relocation-model=static and we need relocation-model=pic
"-Zbuild-std=core,alloc",
"-Zbuild-std-features=compiler-builtins-mem",
],
Expand Down
0