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

llvm(Packages) on darwin: attempts to fix

Browse Source 
- mark llvm34 as broken on darwin (so it doesn't install by default with nix-env)
- don't use our gcc for llvm_34 (might fix the build)
- switch also clang default to 3.3 on darwin (llvm was before)
This commit is contained in:
Vladimír Čunát 2014-04-10 21:19:40 +02:00
parent 297bcd2088
commit 07dc578572
2 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/development/compilers/llvm/3.4/llvm.nix
View File

@ -54,5 +54,6 @@ in stdenv.mkDerivation rec {
license = stdenv.lib.licenses.bsd3;
maintainers = with stdenv.lib.maintainers; [ shlevy lovek323 raskin viric ];
platforms = stdenv.lib.platforms.all;
broken = stdenv.isDarwin;
};
}

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

@ -2424,7 +2424,7 @@ let
clangUnwrapped = llvm: pkg: callPackage pkg {
stdenv = if stdenv.isDarwin
then stdenvAdapters.overrideGCC stdenv gccApple
else stdenvAdapters.overrideGCC stdenv gcc48;
else stdenv;
llvm = llvm;
};
@ -2926,10 +2926,9 @@ let
lessc = callPackage ../development/compilers/lessc { };
llvm = if stdenv.isDarwin then llvm_33 # until someone solves build problems with _34
else llvmPackages.llvm;
llvm = llvmPackages.llvm;
llvm_34 = llvmPackages.llvm;
llvm_34 = llvmPackages_34.llvm;
llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;
llvm_32 = llvm_v ../development/compilers/llvm/3.2;
llvm_31 = llvm_v ../development/compilers/llvm/3.1;
@ -2940,12 +2939,14 @@ let
else stdenv;
};
llvmPackages = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
inherit newScope fetchurl;
llvmPackages = if !stdenv.isDarwin then llvmPackages_34 else {
# until someone solves build problems with _34
llvm = llvm_33;
clang = clang_33;
};
llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
inherit stdenv newScope fetchurl;
isl = isl_0_12;
stdenv = if stdenv.isDarwin
then stdenvAdapters.overrideGCC stdenv gcc48
else stdenv;
});
llvmPackagesSelf = import ../development/compilers/llvm/3.4 { inherit newScope fetchurl; isl = isl_0_12; stdenv = libcxxStdenv; };