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

gcc: Moving the arch=loongson2f to the current platform approach

Browse Source
This commit is contained in:
Lluís Batlle i Rossell 2012-12-31 09:38:32 +00:00
parent ba7cde0156
commit 2402bb2613
3 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/4.6/default.nix
View File

@ -313,8 +313,6 @@ stdenv.mkDerivation ({
) )
) )
} }
${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""} ${if cross != null then crossConfigureFlags else ""}

2
pkgs/development/compilers/gcc/4.7/default.nix
View File

@ -324,8 +324,6 @@ stdenv.mkDerivation ({
${if (stdenv ? glibc && cross == null) ${if (stdenv ? glibc && cross == null)
then " --with-native-system-header-dir=${stdenv.glibc}/include" then " --with-native-system-header-dir=${stdenv.glibc}/include"
else ""} else ""}
${ # Trick that should be taken out once we have a mips64el-linux not loongson2f
if cross == null && stdenv.system == "mips64el-linux" then "--with-arch=loongson2f" else ""}
${if langAda then " --enable-libada" else ""} ${if langAda then " --enable-libada" else ""}
${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""} ${if cross == null && stdenv.isi686 then "--with-arch=i686" else ""}
${if cross != null then crossConfigureFlags else ""} ${if cross != null then crossConfigureFlags else ""}

1
pkgs/top-level/platforms.nix
View File

@ -378,5 +378,6 @@ rec {
''; '';
kernelTarget = "vmlinux"; kernelTarget = "vmlinux";
uboot = null; uboot = null;
gcc.arch = "loongson2f";
}; };
} }