dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

linux bootstrap tools: Use right system for some raw derivations

Browse Source 
This allows cross builds to work. Evidentallyy this has been done wrong
since I combined the bootstrap tool creation files in
ab651d2c9b. Oops!
This commit is contained in:
John Ericson 2018-11-01 16:19:17 -04:00
parent ffaffb36d1
commit f2ed7c7af9
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/stdenv/linux/make-bootstrap-tools.nix
View File

@ -201,19 +201,19 @@ in with pkgs; rec {
bootstrapTools = if (stdenv.hostPlatform.libc == "glibc") then bootstrapTools = if (stdenv.hostPlatform.libc == "glibc") then
import ./bootstrap-tools { import ./bootstrap-tools {
inherit (stdenv.hostPlatform) system; inherit (stdenv.buildPlatform) system; # Used to determine where to build
inherit bootstrapFiles; inherit bootstrapFiles;
} }
else if (stdenv.hostPlatform.libc == "musl") then else if (stdenv.hostPlatform.libc == "musl") then
import ./bootstrap-tools-musl { import ./bootstrap-tools-musl {
inherit (stdenv.hostPlatform) system; inherit (stdenv.buildPlatform) system; # Used to determine where to build
inherit bootstrapFiles; inherit bootstrapFiles;
} }
else throw "unsupported libc"; else throw "unsupported libc";
test = derivation { test = derivation {
name = "test-bootstrap-tools"; name = "test-bootstrap-tools";
inherit (stdenv.hostPlatform) system; inherit (stdenv.hostPlatform) system; # We cannot "cross test"
builder = bootstrapFiles.busybox; builder = bootstrapFiles.busybox;
args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ]; args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ];