JakeHillion/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "make-bootstrap-tools.darwin: upgrade to llvm 3.8"

Browse Source 
This reverts commit bddf4e2180.

Trying to fix stdenvBootstrapTools.x86_64-darwin.stdenv

cc @copumpkin @domenkozar
This commit is contained in:
obadz 2016-08-29 14:06:45 +01:00
parent c527ece0b1
commit 6389f9b349
1 changed files with 4 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
pkgs/stdenv/darwin/make-bootstrap-tools.nix
View File

@ -2,9 +2,7 @@
with import ../../.. { inherit system; };
let
llvmPackages = llvmPackages_38;
in rec {
rec {
coreutils_ = coreutils.override (args: {
# We want coreutils without ACL support.
aclSupport = false;
@ -80,11 +78,11 @@ in rec {
cp -rL ${llvmPackages.clang-unwrapped}/lib/clang $out/lib
cp -d ${llvmPackages.libcxx}/lib/libc++*.dylib $out/lib
cp -d ${llvmPackages.libcxxabi}/lib/libc++abi*.dylib $out/lib
cp -d ${libcxx}/lib/libc++*.dylib $out/lib
cp -d ${libcxxabi}/lib/libc++abi*.dylib $out/lib
mkdir $out/include
cp -rd ${llvmPackages.libcxx}/include/c++ $out/include
cp -rd ${libcxx}/include/c++ $out/include
cp -d ${icu.out}/lib/libicu*.dylib $out/lib
cp -d ${zlib.out}/lib/libz.* $out/lib