Merge branch 'fix-clang-35' of git://github.com/expipiplus1/nixpkgs
This commit is contained in:
commit
ca81eef753
|
@ -50,6 +50,5 @@ in stdenv.mkDerivation {
|
|||
homepage = http://llvm.org/;
|
||||
license = stdenv.lib.licenses.bsd3;
|
||||
platforms = stdenv.lib.platforms.all;
|
||||
broken = true;
|
||||
};
|
||||
}
|
||||
|
|
15
pkgs/development/compilers/llvm/3.5/fix-15974.patch
Normal file
15
pkgs/development/compilers/llvm/3.5/fix-15974.patch
Normal file
|
@ -0,0 +1,15 @@
|
|||
diff --git a/include/llvm/ADT/IntrusiveRefCntPtr.h b/include/llvm/ADT/IntrusiveRefCntPtr.h
|
||||
index f9df378..9d860ec 100644
|
||||
--- a/include/llvm/ADT/IntrusiveRefCntPtr.h
|
||||
+++ b/include/llvm/ADT/IntrusiveRefCntPtr.h
|
||||
@@ -134,9 +134,9 @@ public:
|
||||
//===----------------------------------------------------------------------===//
|
||||
template <typename T>
|
||||
class IntrusiveRefCntPtr {
|
||||
+ public:
|
||||
T* Obj;
|
||||
|
||||
- public:
|
||||
typedef T element_type;
|
||||
|
||||
explicit IntrusiveRefCntPtr() : Obj(nullptr) {}
|
|
@ -53,6 +53,8 @@ in stdenv.mkDerivation rec {
|
|||
"-DCAN_TARGET_i386=false"
|
||||
];
|
||||
|
||||
patches = [ ./fix-15974.patch ];
|
||||
|
||||
postBuild = ''
|
||||
rm -fR $out
|
||||
|
||||
|
@ -75,3 +77,4 @@ in stdenv.mkDerivation rec {
|
|||
platforms = stdenv.lib.platforms.all;
|
||||
};
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue