nix: Allow for more precision in sysroot config

Signed-off-by: Nick Spinale <[email protected]>
seL4 · Apr 22, 2024 · f34cfa6 · f34cfa6
1 parent a20aab1
commit f34cfa6
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/hacking/nix/rust-utils/build-sysroot.nix b/hacking/nix/rust-utils/build-sysroot.nix
@@ -25,7 +25,8 @@ in
 , extraManifest ? {}
 , extraConfig ? {}
 , rustTargetInfo ? defaultRustTargetInfo
-, compilerBuiltinsWeakIntrinsics ? false
+, alloc ? true
+, compilerBuiltinsMem ? true
 }:
 
 let
@@ -70,10 +71,15 @@ let
     extraConfig
   ]);
 
-  features = lib.concatStringsSep "," ([
+  crates = lib.concatStringsSep "," ([
+    "core"
+    "compiler_builtins"
+  ] ++ lib.optionals alloc [
+    "alloc"
+  ]);
+
+  features = lib.concatStringsSep "," (lib.optionals compilerBuiltinsMem [
     "compiler-builtins-mem"
-  ] ++ lib.optionals compilerBuiltinsWeakIntrinsics [
-    "compiler-builtins-weak-intrinsics"
   ]);
 
 in
@@ -90,7 +96,7 @@ runCommand "sysroot" {
     --config ${config} \
     ${lib.optionalString (profile != null) "--profile ${profile}"} \
     --target ${rustTargetInfo.name} \
-    -Z build-std=core,alloc,compiler_builtins \
+    -Z build-std=${crates} \
     -Z build-std-features=${features} \
     --manifest-path ${workspace}/Cargo.toml \
     --target-dir $(pwd)/target

diff --git a/hacking/nix/scope/world/sel4-kernel-loader.nix b/hacking/nix/scope/world/sel4-kernel-loader.nix
@@ -41,6 +41,7 @@ let
   sysroot = buildSysroot {
     inherit profile rustTargetInfo;
     extraManifest = profiles;
+    alloc = false;
   };
 
 in