git.iko.soy/typeable/nixpkgs
on master help sign in
linux bootstrap tools: Use right system for some raw derivations

This allows cross builds to work. Evidentallyy this has been done wrong since I combined the bootstrap tool creation files in ab651d2c9bab620ebe5e515476fbd70d2c5b0c61. Oops!

commitf2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd authorJohn Ericson <John.Ericson@Obsidian.Systems> dateThu 1 Nov 2018, 16:19 (8 years ago) parentffaffb3
1 file changed+3−3
pkgs/stdenv/linux/make-bootstrap-tools.nix+3−3
pkgs/stdenv/linux/make-bootstrap-tools.nix+3−3
@@ -201,19 +201,19 @@ in with pkgs; rec {
201201
202202 bootstrapTools = if (stdenv.hostPlatform.libc == "glibc") then
203203 import ./bootstrap-tools {
204− inherit (stdenv.hostPlatform) system;
204+ inherit (stdenv.buildPlatform) system; # Used to determine where to build
205205 inherit bootstrapFiles;
206206 }
207207 else if (stdenv.hostPlatform.libc == "musl") then
208208 import ./bootstrap-tools-musl {
209− inherit (stdenv.hostPlatform) system;
209+ inherit (stdenv.buildPlatform) system; # Used to determine where to build
210210 inherit bootstrapFiles;
211211 }
212212 else throw "unsupported libc";
213213
214214 test = derivation {
215215 name = "test-bootstrap-tools";
216− inherit (stdenv.hostPlatform) system;
216+ inherit (stdenv.hostPlatform) system; # We cannot "cross test"
217217 builder = bootstrapFiles.busybox;
218218 args = [ "ash" "-e" "-c" "eval \"$buildCommand\"" ];
219219