diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-11-01 16:47:42 -0400 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-11-01 16:47:42 -0400 |
| commit | e3082c313b75f13e8e1049673efe6a42dcd1499f (patch) | |
| tree | 0d11815c9bed24ca9f27d3839ac0f9577d8308e5 /pkgs/stdenv/linux | |
| parent | f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd (diff) | |
| parent | cc41aefe4485dea399930b8d173c26e438cb5e22 (diff) | |
| download | nixpkgs-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar nixpkgs-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.gz nixpkgs-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.bz2 nixpkgs-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.lz nixpkgs-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.xz nixpkgs-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.zst nixpkgs-e3082c313b75f13e8e1049673efe6a42dcd1499f.zip | |
Merge remote-tracking branch 'upstream/master' into release-lib-cleanup
Diffstat (limited to 'pkgs/stdenv/linux')
| -rw-r--r-- | pkgs/stdenv/linux/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/pkgs/stdenv/linux/default.nix b/pkgs/stdenv/linux/default.nix index 884730cfe90..978beea692c 100644 --- a/pkgs/stdenv/linux/default.nix +++ b/pkgs/stdenv/linux/default.nix @@ -92,7 +92,6 @@ let else lib.makeOverridable (import ../../build-support/cc-wrapper) { name = "${name}-gcc-wrapper"; nativeTools = false; - propagateDoc = false; nativeLibc = false; buildPackages = lib.optionalAttrs (prevStage ? stdenv) { inherit (prevStage) stdenv; @@ -346,8 +345,8 @@ in # Mainly avoid reference to bootstrap tools allowedRequisites = with prevStage; with lib; # Simple executable tools - concatMap (p: [ (getBin p) (getLib p) ]) - [ gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils + concatMap (p: [ (getBin p) (getLib p) ]) [ + gzip bzip2 xz bash binutils.bintools coreutils diffutils findutils gawk gnumake gnused gnutar gnugrep gnupatch patchelf ed paxctl ] # Library dependencies diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 58104e6ce26..f4184b92bd5 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -112,8 +112,8 @@ in with pkgs; rec { cp -d ${gcc.cc.out}/bin/gcc $out/bin cp -d ${gcc.cc.out}/bin/cpp $out/bin cp -d ${gcc.cc.out}/bin/g++ $out/bin - cp -d ${gcc.cc.lib}/lib*/libgcc_s.so* $out/lib - cp -d ${gcc.cc.lib}/lib*/libstdc++.so* $out/lib + cp -d ${gcc.cc.lib}/lib/libgcc_s.so* $out/lib + cp -d ${gcc.cc.lib}/lib/libstdc++.so* $out/lib cp -rd ${gcc.cc.out}/lib/gcc $out/lib chmod -R u+w $out/lib rm -f $out/lib/gcc/*/*/include*/linux |