dev/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Actions 2 Packages Projects Releases Wiki Activity

Bump llvm and clang to 2.9

Browse Source 
svn path=/nixpkgs/trunk/; revision=29878
This commit is contained in:
Shea Levy 2011-10-18 16:37:28 +00:00
parent 491c6e43b1
commit 9783d27b7a
2 changed files with 22 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
pkgs/development/compilers/llvm/clang-include-paths.patch
View File

@ -1,15 +1,15 @@
diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/lib/Frontend/InitHeaderSearch.cpp
--- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2010-09-03 18:45:53.000000000 +0200 --- a/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-03-21 20:24:04.000000000 -0400
+++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-02-05 14:59:08.669573190 +0100 +++ b/tools/clang/lib/Frontend/InitHeaderSearch.cpp 2011-10-18 12:09:50.624355551 -0400
@@ -443,6 +443,7 @@ @@ -438,6 +438,7 @@
AddPath(*i, System, false, false, false);
return; void InitHeaderSearch::AddDefaultCIncludePaths(const llvm::Triple &triple,
} const HeaderSearchOptions &HSOpts) {
+#if 0 +#if 0
llvm::Triple::OSType os = triple.getOS(); llvm::Triple::OSType os = triple.getOS();
switch (os) { switch (os) {
case llvm::Triple::Win32: @@ -559,6 +560,8 @@
@@ -532,6 +533,8 @@
} }
AddPath("/usr/include", System, false, false, false); AddPath("/usr/include", System, false, false, false);
@ -18,7 +18,7 @@ diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/l
} }
void InitHeaderSearch:: void InitHeaderSearch::
@@ -550,6 +553,7 @@ @@ -577,6 +580,7 @@
triple); triple);
return; return;
} }
@ -26,7 +26,7 @@ diff -ru -x '*~' a/tools/clang/lib/Frontend/InitHeaderSearch.cpp b/tools/clang/l
// FIXME: temporary hack: hard-coded paths. // FIXME: temporary hack: hard-coded paths.
switch (os) { switch (os) {
case llvm::Triple::Cygwin: case llvm::Triple::Cygwin:
@@ -769,6 +773,10 @@ @@ -847,6 +851,10 @@
default: default:
break; break;
} }

22
pkgs/development/compilers/llvm/default.nix
View File

@ -1,12 +1,14 @@
{ stdenv, fetchurl, gcc, flex, perl, libtool, groff { stdenv, fetchurl, gcc, flex, perl, libtool, groff
, buildClang ? false }: , buildClang ? false }:
let version = "2.9"; in
stdenv.mkDerivation ({ stdenv.mkDerivation ({
name = "llvm-2.8"; name = "llvm-${version}";
src = fetchurl { src = fetchurl {
url = http://llvm.org/releases/2.8/llvm-2.8.tgz; url = "http://llvm.org/releases/${version}/llvm-${version}.tgz";
sha256 = "0fyl2gk2ld28isz9bq4f6r4dhqm9vljfj3pdfwlc2v0w5xsdpb95"; sha256 = "0y9pgdakn3n0vf8zs6fjxjw6972nyw4rkfwwza6b8a3ll77kc4k6";
}; };
buildInputs = [ gcc flex perl groff ]; buildInputs = [ gcc flex perl groff ];
@ -17,7 +19,7 @@ stdenv.mkDerivation ({
homepage = http://llvm.org/; homepage = http://llvm.org/;
description = "Collection of modular and reusable compiler and toolchain technologies"; description = "Collection of modular and reusable compiler and toolchain technologies";
license = "BSD"; license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric shlevy];
platforms = with stdenv.lib.platforms; all; platforms = with stdenv.lib.platforms; all;
}; };
} }
@ -30,17 +32,17 @@ stdenv.mkDerivation ({
else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu" else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
else throw "System not supported"; else throw "System not supported";
in { in {
name = "clang-2.8"; name = "clang-${version}";
srcClang = fetchurl { srcClang = fetchurl {
url = http://llvm.org/releases/2.8/clang-2.8.tgz; url = "http://llvm.org/releases/${version}/clang-${version}.tgz";
sha256 = "1hg0vqmyr4wdy686l2bga0rpin41v0q9ds2k5659m8z6acali0zd"; sha256 = "1pq9g7qxw761dp6gx3amx39kl9p4zhlymmn8gfmcnw9ag0zizi3h";
}; };
prePatch = '' prePatch = ''
pushd tools pushd tools
unpackFile $srcClang unpackFile $srcClang
mv clang-2.8 clang mv clang-${version} clang
popd popd
find find
''; '';
@ -59,7 +61,7 @@ stdenv.mkDerivation ({
homepage = http://clang.llvm.org/; homepage = http://clang.llvm.org/;
description = "A C language family frontend for LLVM"; description = "A C language family frontend for LLVM";
license = "BSD"; license = "BSD";
maintainers = with stdenv.lib.maintainers; [viric]; maintainers = with stdenv.lib.maintainers; [viric shlevy];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; linux;
}; };
} }