Merge branch 'master.upstream' into staging.upstream

2015-06-12 13:47:46 -07:00
parent 85ae0cb070 5ee75e236c
commit 954801a9a8
127 changed files with 1911 additions and 6798 deletions
@@ -44,6 +44,7 @@ in stdenv.mkDerivation rec {
    "-DCMAKE_BUILD_TYPE=Release"
    "-DLLVM_BUILD_TESTS=ON"
    "-DLLVM_ENABLE_FFI=ON"
+    "-DLLVM_REQUIRES_RTTI=1"
    "-DLLVM_BINUTILS_INCDIR=${binutils}/include"
    "-DCMAKE_CXX_FLAGS=-std=c++11"
  ] ++ stdenv.lib.optional (!isDarwin) "-DBUILD_SHARED_LIBS=ON";