From a1f1d0d442100c2f9199f9a9427fbc34e978cd17 Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Tue, 3 Feb 2015 20:01:39 -0500 Subject: [PATCH 1/2] Switch default llvm to 3.5 --- pkgs/top-level/all-packages.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index c6ae8dcb0bb1..e355c21596d3 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3638,7 +3638,7 @@ let 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 { inherit stdenv newScope fetchurl; From 0e225c0e37175ed450525dd6c39c3746b6a0268c Mon Sep 17 00:00:00 2001 From: Shea Levy Date: Wed, 4 Feb 2015 11:30:25 -0500 Subject: [PATCH 2/2] llvm-3.5: Don't try to use libc++ on linux --- pkgs/development/compilers/llvm/3.5/llvm.nix | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index c1b2d69c5da0..00de67c60529 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -42,9 +42,11 @@ in stdenv.mkDerivation rec { "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" "-DLLVM_BINUTILS_INCDIR=${binutils}/include" - "-DCMAKE_CXX_FLAGS=-stdlib=libc++" ] ++ 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 = '' rm -fR $out