Merge commit '6389f9b' (was in staging)

obadz e7b2f05d 03b9a159

+4 -6
+4 -6
pkgs/stdenv/darwin/make-bootstrap-tools.nix
··· 2 3 with import ../../.. { inherit system; }; 4 5 - let 6 - llvmPackages = llvmPackages_38; 7 - in rec { 8 coreutils_ = coreutils.override (args: { 9 # We want coreutils without ACL support. 10 aclSupport = false; ··· 80 81 cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib 82 83 - cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib 84 - cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib 85 86 mkdir $out/include 87 - cp -rd ${llvmPackages.libcxx}/include/c++ $out/include 88 89 cp -d ${icu.out}/lib/libicu*.dylib $out/lib 90 cp -d ${zlib.out}/lib/libz.* $out/lib
··· 2 3 with import ../../.. { inherit system; }; 4 5 + rec { 6 coreutils_ = coreutils.override (args: { 7 # We want coreutils without ACL support. 8 aclSupport = false; ··· 78 79 cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib 80 81 + cp -d ${libcxx}/lib/libc++*.dylib $out/lib 82 + cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib 83 84 mkdir $out/include 85 + cp -rd ${libcxx}/include/c++ $out/include 86 87 cp -d ${icu.out}/lib/libicu*.dylib $out/lib 88 cp -d ${zlib.out}/lib/libz.* $out/lib