linux bootstrap for musl: kludgery

+7 -3
+1 -1
pkgs/stdenv/linux/bootstrap-tools-musl/default.nix
··· 14 # Needed by the GCC wrapper. 15 langC = true; 16 langCC = true; 17 - isGNU = false; 18 }
··· 14 # Needed by the GCC wrapper. 15 langC = true; 16 langCC = true; 17 + isGNU = true; 18 }
+6 -2
pkgs/stdenv/linux/default.nix
··· 6 { lib 7 , localSystem, crossSystem, config, overlays 8 9 - , bootstrapFiles ? { # switch 10 "i686-linux" = import ./bootstrap-files/i686.nix; 11 "x86_64-linux" = import ./bootstrap-files/x86_64.nix; 12 "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; ··· 40 41 42 # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). 43 - bootstrapTools = import ./bootstrap-tools { inherit system bootstrapFiles; }; 44 45 46 # This function builds the various standard environments used during ··· 140 buildCommand = '' 141 mkdir -p $out 142 ln -s ${bootstrapTools}/lib $out/lib 143 ln -s ${bootstrapTools}/include-glibc $out/include 144 ''; 145 }; 146 gcc-unwrapped = bootstrapTools;
··· 6 { lib 7 , localSystem, crossSystem, config, overlays 8 9 + , bootstrapFiles ? if localSystem.libc == "musl" then import ./bootstrap-files/musl64.nix 10 + else { # switch 11 "i686-linux" = import ./bootstrap-files/i686.nix; 12 "x86_64-linux" = import ./bootstrap-files/x86_64.nix; 13 "armv5tel-linux" = import ./bootstrap-files/armv5tel.nix; ··· 41 42 43 # Download and unpack the bootstrap tools (coreutils, GCC, Glibc, ...). 44 + bootstrapTools = import (if localSystem.libc == "musl" then ./bootstrap-tools-musl else ./bootstrap-tools) { inherit system bootstrapFiles; }; 45 46 47 # This function builds the various standard environments used during ··· 141 buildCommand = '' 142 mkdir -p $out 143 ln -s ${bootstrapTools}/lib $out/lib 144 + '' + lib.optionalString (localSystem.libc == "glibc") '' 145 ln -s ${bootstrapTools}/include-glibc $out/include 146 + '' + lib.optionalString (localSystem.libc == "musl") '' 147 + ln -s ${bootstrapTools}/include-libc $out/include 148 ''; 149 }; 150 gcc-unwrapped = bootstrapTools;