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

darwin: move to llvm7

Browse Source
This commit is contained in:
Matthew Bauer 2019-02-06 20:27:25 -05:00
parent d69cc779b5
commit ae1e940cc0
4 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
pkgs/stdenv/darwin/default.nix
View File

@ -158,7 +158,7 @@ in rec {
dyld = bootstrapTools; dyld = bootstrapTools;
}; };
llvmPackages_5 = { llvmPackages_7 = {
libcxx = stdenv.mkDerivation { libcxx = stdenv.mkDerivation {
name = "bootstrap-stage0-libcxx"; name = "bootstrap-stage0-libcxx";
phases = [ "installPhase" "fixupPhase" ]; phases = [ "installPhase" "fixupPhase" ];
@ -260,9 +260,9 @@ in rec {
# Avoid pulling in a full python and its extra dependencies for the llvm/clang builds. # Avoid pulling in a full python and its extra dependencies for the llvm/clang builds.
libxml2 = super.libxml2.override { pythonSupport = false; }; libxml2 = super.libxml2.override { pythonSupport = false; };
llvmPackages_5 = super.llvmPackages_5 // (let llvmPackages_7 = super.llvmPackages_7 // (let
libraries = super.llvmPackages_5.libraries.extend (_: _: { libraries = super.llvmPackages_7.libraries.extend (_: _: {
inherit (llvmPackages_5) libcxx libcxxabi; inherit (llvmPackages_7) libcxx libcxxabi;
}); });
in { inherit libraries; } // libraries); in { inherit libraries; } // libraries);
@ -314,12 +314,12 @@ in rec {
]; ];
}); });
llvmPackages_5 = super.llvmPackages_5 // (let llvmPackages_7 = super.llvmPackages_7 // (let
tools = super.llvmPackages_5.tools.extend (llvmSelf: _: { tools = super.llvmPackages_7.tools.extend (llvmSelf: _: {
inherit (llvmPackages_5) llvm clang-unwrapped; inherit (llvmPackages_7) llvm clang-unwrapped;
}); });
libraries = super.llvmPackages_5.libraries.extend (llvmSelf: _: { libraries = super.llvmPackages_7.libraries.extend (llvmSelf: _: {
inherit (llvmPackages_5) libcxx libcxxabi compiler-rt; inherit (llvmPackages_7) libcxx libcxxabi compiler-rt;
}); });
in { inherit tools libraries; } // tools // libraries); in { inherit tools libraries; } // tools // libraries);
@ -353,12 +353,12 @@ in rec {
ncurses libffi zlib llvm gmp pcre gnugrep ncurses libffi zlib llvm gmp pcre gnugrep
coreutils findutils diffutils patchutils; coreutils findutils diffutils patchutils;
llvmPackages_5 = super.llvmPackages_5 // (let llvmPackages_7 = super.llvmPackages_7 // (let
tools = super.llvmPackages_5.tools.extend (_: super: { tools = super.llvmPackages_7.tools.extend (_: super: {
inherit (llvmPackages_5) llvm clang-unwrapped; inherit (llvmPackages_7) llvm clang-unwrapped;
}); });
libraries = super.llvmPackages_5.libraries.extend (_: _: { libraries = super.llvmPackages_7.libraries.extend (_: _: {
inherit (llvmPackages_5) compiler-rt libcxx libcxxabi; inherit (llvmPackages_7) compiler-rt libcxx libcxxabi;
}); });
in { inherit tools libraries; } // tools // libraries); in { inherit tools libraries; } // tools // libraries);

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

@ -3,7 +3,7 @@
with import pkgspath { inherit system; }; with import pkgspath { inherit system; };
let let
llvmPackages = llvmPackages_5; llvmPackages = llvmPackages_7;
in rec { in rec {
coreutils_ = coreutils.override (args: { coreutils_ = coreutils.override (args: {
# We want coreutils without ACL support. # We want coreutils without ACL support.

2
pkgs/top-level/all-packages.nix
View File

@ -7544,7 +7544,7 @@ in
llvm_37 = llvmPackages_37.llvm; llvm_37 = llvmPackages_37.llvm;
llvm_35 = llvmPackages_35.llvm; llvm_35 = llvmPackages_35.llvm;
llvmPackages = recurseIntoAttrs (if stdenv.isDarwin then llvmPackages_5 else llvmPackages_7); llvmPackages = recurseIntoAttrs llvmPackages_7;
llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({ llvmPackages_35 = callPackage ../development/compilers/llvm/3.5 ({
isl = isl_0_14; isl = isl_0_14;

2
pkgs/top-level/darwin-packages.nix
View File

@ -15,7 +15,7 @@ in
binutils-unwrapped = callPackage ../os-specific/darwin/binutils { binutils-unwrapped = callPackage ../os-specific/darwin/binutils {
inherit (darwin) cctools; inherit (darwin) cctools;
inherit (pkgs) binutils-unwrapped; inherit (pkgs) binutils-unwrapped;
inherit (pkgs.llvmPackages_5) llvm; inherit (pkgs.llvmPackages_7) llvm;
}; };
binutils = pkgs.wrapBintoolsWith { binutils = pkgs.wrapBintoolsWith {