Rearrange llvm dependencies slightly to avoid unnecessary dependencies on darwin (binutils is only used for gold integration, which doesn't apply on darwin)

2015-02-18 02:05:43 -05:00
parent ae0263f960
commit c6ce6460c4
1 changed files with 3 additions and 2 deletions
--- a/pkgs/development/compilers/llvm/3.5/llvm.nix
+++ b/pkgs/development/compilers/llvm/3.5/llvm.nix
@@ -41,9 +41,10 @@ in stdenv.mkDerivation rec {
    "-DCMAKE_BUILD_TYPE=Release"
    "-DLLVM_BUILD_TESTS=ON"
    "-DLLVM_ENABLE_FFI=ON"
+  ] ++ stdenv.lib.optionals (!isDarwin) [
+    "-DBUILD_SHARED_LIBS=ON"
    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
-  ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"
-    ++ stdenv.lib.optionals ( isDarwin) [
+  ] ++ stdenv.lib.optionals ( isDarwin) [
    "-DCMAKE_CXX_FLAGS=-stdlib=libc++"
    "-DCAN_TARGET_i386=false"
  ];