From c0def4a169755c17db2203bae3c8d46f08cb6d99 Mon Sep 17 00:00:00 2001 From: Eduard Bachmakov Date: Fri, 20 Feb 2015 16:29:52 +0100 Subject: [PATCH] llvm-3.5: enable RTTI to support mesa Extracted from #6367. --- pkgs/development/compilers/llvm/3.5/llvm.nix | 1 + pkgs/top-level/all-packages.nix | 1 + 2 files changed, 2 insertions(+) diff --git a/pkgs/development/compilers/llvm/3.5/llvm.nix b/pkgs/development/compilers/llvm/3.5/llvm.nix index bacd0b26643..7e11caa66f0 100644 --- a/pkgs/development/compilers/llvm/3.5/llvm.nix +++ b/pkgs/development/compilers/llvm/3.5/llvm.nix @@ -41,6 +41,7 @@ in stdenv.mkDerivation rec { "-DCMAKE_BUILD_TYPE=Release" "-DLLVM_BUILD_TESTS=ON" "-DLLVM_ENABLE_FFI=ON" + "-DLLVM_REQUIRES_RTTI=1" ] ++ stdenv.lib.optionals (!isDarwin) [ "-DBUILD_SHARED_LIBS=ON" "-DLLVM_BINUTILS_INCDIR=${binutils}/include" diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 8faa7a548a9..25b34d79160 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -3714,6 +3714,7 @@ let llvm = llvmPackages.llvm; + llvm_35 = llvmPackages_35.llvm; llvm_34 = llvmPackages_34.llvm; llvm_33 = llvm_v ../development/compilers/llvm/3.3/llvm.nix;