diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 19:22:02 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2017-04-14 19:22:02 +0200 |
| commit | f7a4f146c9fd64966f57040603a897857a14df94 (patch) | |
| tree | 088bb991f168b899e7c36df46aac6aa0611b5052 /pkgs/stdenv | |
| parent | 878bbaf4e9d49c251d90f0790d2e7ebcf622ddd0 (diff) | |
| parent | 2090aa4f65e860567af03cb3b7aa042df7168ead (diff) | |
| download | nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar.gz nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar.bz2 nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar.lz nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar.xz nixlib-f7a4f146c9fd64966f57040603a897857a14df94.tar.zst nixlib-f7a4f146c9fd64966f57040603a897857a14df94.zip | |
Merge branch 'master' into staging
This includes a fix for a bad merge.
Diffstat (limited to 'pkgs/stdenv')
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools-cross.nix | 3 | ||||
| -rw-r--r-- | pkgs/stdenv/linux/make-bootstrap-tools.nix | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix index 1a762bd87c79..613edfafd954 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools-cross.nix @@ -221,8 +221,7 @@ rec { # GCC has certain things built in statically. See # pkgs/stdenv/linux/default.nix for the details. cp -d ${isl}/lib/libisl*.so* $out/lib - # Also this is needed since bzip2 uses a custom build system - # for native builds but autoconf (via a patch) for cross builds + cp -d ${bzip2.out}/lib/libbz2.so* $out/lib # Copy binutils. diff --git a/pkgs/stdenv/linux/make-bootstrap-tools.nix b/pkgs/stdenv/linux/make-bootstrap-tools.nix index 42015a79a3e0..2ce73eb781d8 100644 --- a/pkgs/stdenv/linux/make-bootstrap-tools.nix +++ b/pkgs/stdenv/linux/make-bootstrap-tools.nix @@ -122,6 +122,8 @@ rec { cp -d ${zlib.out}/lib/libz.so* $out/lib cp -d ${libelf}/lib/libelf.so* $out/lib + cp -d ${bzip2.out}/lib/libbz2.so* $out/lib + # Copy binutils. for i in as ld ar ranlib nm strip readelf objdump; do cp ${binutils.out}/bin/$i $out/bin |