public/nixpkgs
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

clang: have gcc tell us its target triplet, no need to limit to x86 linuces

Browse Source 
svn path=/nixpkgs/trunk/; revision=29924
This commit is contained in:
Shea Levy 2011-10-20 02:07:00 +00:00
parent 1214310f5d
commit 252286194e
1 changed files with 3 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkgs/development/compilers/llvm/clang.nix
View File

@ -1,13 +1,6 @@
{ stdenv, fetchurl, perl, groff, llvm }: { stdenv, fetchurl, perl, groff, llvm }:
assert stdenv.system == "i686-linux" || stdenv.system == "x86_64-linux"; let version = "2.9"; in
let
triplet = if (stdenv.system == "i686-linux") then "i686-pc-linux-gnu"
else if (stdenv.system == "x86_64-linux") then "x86_64-unknown-linux-gnu"
else throw "System not supported";
version = "2.9";
in
stdenv.mkDerivation { stdenv.mkDerivation {
name = "clang-${version}"; name = "clang-${version}";
@ -41,7 +34,7 @@ stdenv.mkDerivation {
preBuild = '' preBuild = ''
sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \ sed -i -e 's,C_INCLUDE_PATH,"${stdenv.gcc.libc}/include/",' \
-e 's,CPP_HOST,"${triplet}",' \ -e 's,CPP_HOST,"'$(${stdenv.gcc.gcc}/bin/gcc -dumpmachine)'",' \
-e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \ -e 's,CPP_INCLUDE_PATH,"${stdenv.gcc.gcc}/include/c++/${stdenv.gcc.gcc.version}",' \
tools/clang/lib/Frontend/InitHeaderSearch.cpp tools/clang/lib/Frontend/InitHeaderSearch.cpp
@ -63,6 +56,6 @@ stdenv.mkDerivation {
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 shlevy]; maintainers = with stdenv.lib.maintainers; [viric shlevy];
platforms = with stdenv.lib.platforms; linux; platforms = with stdenv.lib.platforms; all;
}; };
} }