Skip to content

wrapRustcWith: allow --sysroot to be overridden #274853

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
alyssais merged 2 commits into from
Dec 19, 2023
Merged

wrapRustcWith: allow --sysroot to be overridden #274853

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1200bc2
wrapRustcWith: allow --sysroot to be overridden
alyssais Dec 17, 2023
f0b116e
Revert "rust-hypervisor-firmware: fix build (#257345)"
alyssais Dec 17, 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
9 changes: 1 addition & 8 deletions pkgs/applications/virtualization/rust-hypervisor-firmware/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
{ lib
, fetchFromGitHub
, hostPlatform
, cargo
, rustc
, lld
}:

Expand All @@ -24,12 +22,7 @@ let
};
};

# inherit (cross) rustPlatform;
# ^ breaks because we are doing a no_std embedded build with a custom sysroot,
# but the fast_cross rustc wrapper already passes a sysroot argument
rustPlatform = cross.makeRustPlatform {
inherit rustc cargo;
};
inherit (cross) rustPlatform;

in

Expand Down
15 changes: 14 additions & 1 deletion pkgs/build-support/rust/rustc-wrapper/rustc-wrapper.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,19 @@
#!@shell@

extraBefore=(@sysroot@)
defaultSysroot=(@sysroot@)

for arg; do
Copy link
Contributor

@dblsaiko dblsaiko Dec 17, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Every day I learn some crazy new bash syntax. :^)

case "$arg" in
--sysroot)
defaultSysroot=()
;;
--)
break
;;
esac
done

extraBefore=("${defaultSysroot[@]}")
extraAfter=($NIX_RUSTFLAGS)

# Optionally print debug info.
Expand Down