ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-01 08:25:55 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'llvm-bump'

Browse Source 
Bump default llvm on non-darwin too
This commit is contained in:
Shea Levy 2015-02-04 11:48:50 -05:00
commit b45aa294d4
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/development/compilers/llvm/3.5/llvm.nix
View File

@ -42,9 +42,11 @@ in stdenv.mkDerivation rec {
"-DLLVM_BUILD_TESTS=ON" "-DLLVM_BUILD_TESTS=ON"
"-DLLVM_ENABLE_FFI=ON" "-DLLVM_ENABLE_FFI=ON"
"-DLLVM_BINUTILS_INCDIR=${binutils}/include" "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON" ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"
++ stdenv.lib.optional ( isDarwin) "-DCAN_TARGET_i386=false"; ++ stdenv.lib.optionals ( isDarwin) [
"-DCMAKE_CXX_FLAGS=-stdlib=libc++"
"-DCAN_TARGET_i386=false"
];
postBuild = '' postBuild = ''
rm -fR $out rm -fR $out

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

@ -3638,7 +3638,7 @@ let
llvm_v = path: callPackage path { }; llvm_v = path: callPackage path { };
llvmPackages = if stdenv.isDarwin then llvmPackages_35 else llvmPackages_34; llvmPackages = llvmPackages_35;
llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 { llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {
inherit stdenv newScope fetchurl; inherit stdenv newScope fetchurl;