Unverified Commit 8e47b2a9 authored by Philip Taron's avatar Philip Taron Committed by GitHub
Browse files

freebsd stdenv: be more principled about portioning out bootstrap libraries (#356760)

parents 9132f1b4 2ca435a5

pkgs/stdenv/freebsd/default.nix

+55 −2
Original line number Diff line number Diff line
@@ -242,11 +242,13 @@ let 
        #"bin/gunzip"

      ];

    };

    bzip2 = linkBootstrap { paths = [ "bin/bzip2" ]; };

    bzip2 = linkBootstrap { paths = [ "bin/bzip2" "lib/libbz2.so" "lib/libbz2.so.1" ]; };

    xz = linkBootstrap {

      paths = [

        "bin/xz"

        "bin/unxz"

        "lib/liblzma.so"

        "lib/liblzma.so.5"

      ];

    };

    binutils-unwrapped = linkBootstrap {
@@ -274,7 +276,58 @@ let 
      libc = linkBootstrap {

        name = "bootstrapLibs";

        paths = [

          "lib"

          "lib/Scrt1.o"

          "lib/crt1.o"

          "lib/crtbegin.o"

          "lib/crtbeginS.o"

          "lib/crtbeginT.o"

          "lib/crtend.o"

          "lib/crtendS.o"

          "lib/crti.o"

          "lib/crtn.o"

          "lib/libc++.a"

          "lib/libc++.so"

          "lib/libc++.so.1"

          "lib/libc.a"

          "lib/libc.so"

          "lib/libc.so.7"

          "lib/libc_nonshared.a"

          "lib/libcrypt.so"

          "lib/libcrypt.so.5"

          "lib/libcxxrt.a"

          "lib/libcxxrt.so"

          "lib/libcxxrt.so.1"

          "lib/libdevstat.so"

          "lib/libdevstat.so.7"

          "lib/libdl.so"

          "lib/libdl.so.1"

          "lib/libelf.so"

          "lib/libelf.so.2"

          "lib/libexecinfo.so"

          "lib/libexecinfo.so.1"

          "lib/libgcc.a"

          "lib/libgcc_eh.a"

          "lib/libgcc_s.so"

          "lib/libgcc_s.so.1"

          "lib/libkvm.so"

          "lib/libkvm.so.7"

          "lib/libm.a"

          "lib/libm.so"

          "lib/libm.so.5"

          "lib/libmd.so"

          "lib/libmd.so.6"

          "lib/libncurses.so"

          "lib/libncurses.so.6"

          "lib/libncursesw.so"

          "lib/libncursesw.so.6"

          "lib/libpthread.so"

          "lib/librt.so"

          "lib/librt.so.1"

          "lib/libthr.so"

          "lib/libthr.so.3"

          "lib/libutil.so"

          "lib/libutil.so.9"

          "lib/libxnet.so"

          "include"

          "share"

          "libexec"