commit b45aa294d430af6588d65878c82e1eabc33e8576 · pyrox.dev/nixpkgs

+4 -2

pkgs/development/compilers/llvm/3.5/llvm.nix

···

       42
       42
        
           "-DLLVM_BUILD_TESTS=ON"

     

       43
       43
        
           "-DLLVM_ENABLE_FFI=ON"

     

       44
       44
        
           "-DLLVM_BINUTILS_INCDIR=${binutils}/include"

     

       45
       45
       -
           "-DCMAKE_CXX_FLAGS=-stdlib=libc++"

     

       46
       45
        
         ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON"

     

       47
       47
       -
           ++ stdenv.lib.optional ( isDarwin) "-DCAN_TARGET_i386=false";

     

       46
       46
       +
           ++ stdenv.lib.optionals ( isDarwin) [

     

       47
       47
       +
           "-DCMAKE_CXX_FLAGS=-stdlib=libc++"

     

       48
       48
       +
           "-DCAN_TARGET_i386=false"

     

       49
       49
       +
         ];

     

       48
       50
        
       

     

       49
       51
        
         postBuild = ''

     

       50
       52
        
           rm -fR $out

+1 -1

pkgs/top-level/all-packages.nix

···

       3638
       3638
        
       

     

       3639
       3639
        
         llvm_v = path: callPackage path { };

     

       3640
       3640
        
       

     

       3641
       3641
       -
         llvmPackages = if stdenv.isDarwin then llvmPackages_35 else llvmPackages_34;

     

       3641
       3641
       +
         llvmPackages = llvmPackages_35;

     

       3642
       3642
        
       

     

       3643
       3643
        
         llvmPackages_34 = recurseIntoAttrs (import ../development/compilers/llvm/3.4 {

     

       3644
       3644
        
           inherit stdenv newScope fetchurl;