ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-25 12:22:37 +03:00
Code Issues Projects Releases Wiki Activity

move binutils-arm to binutils-cross. Also, add binutils for mips-linux in a

Browse Source 
more generic way. Still, there is a lot of room for improvement.

svn path=/nixpkgs/trunk/; revision=4458
This commit is contained in:
Armijn Hemel 2005-12-31 03:46:20 +00:00
parent fec867b5f2
commit 8b10549f2e
3 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

0
pkgs/development/tools/misc/binutils-arm/builder.sh → pkgs/development/tools/misc/binutils-cross/builder.sh
View File

6
pkgs/development/tools/misc/binutils-arm/default.nix → pkgs/development/tools/misc/binutils-cross/default.nix
View File

@ -1,12 +1,12 @@
{stdenv, fetchurl, noSysDirs}: {stdenv, fetchurl, noSysDirs, cross}:
stdenv.mkDerivation { stdenv.mkDerivation {
name = "binutils-2.16.1-arm"; name = "binutils-2.16.1";
builder = ./builder.sh; builder = ./builder.sh;
src = fetchurl { src = fetchurl {
url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2; url = http://ftp.nluug.nl/gnu/binutils/binutils-2.16.1.tar.bz2;
md5 = "6a9d529efb285071dad10e1f3d2b2967"; md5 = "6a9d529efb285071dad10e1f3d2b2967";
}; };
inherit noSysDirs; inherit noSysDirs;
configureFlags = "--target=arm-linux"; configureFlags = if cross=="arm-linux" then "--target=arm-linux" else if cross=="mips-linux" then "--target=mips-linux" else "";
} }

19
pkgs/system/all-packages-generic.nix
View File

@ -322,8 +322,14 @@ rec {
inherit fetchurl stdenv noSysDirs; inherit fetchurl stdenv noSysDirs;
}; };
binutilsArm = (import ../development/tools/misc/binutils-arm) { binutilsMips = (import ../development/tools/misc/binutils-cross) {
inherit fetchurl stdenv noSysDirs; inherit fetchurl stdenv noSysDirs;
cross = "mips-linux";
};
binutilsArm = (import ../development/tools/misc/binutils-cross) {
inherit fetchurl stdenv noSysDirs;
cross = "arm-linux";
}; };
patchelf = (import ../development/tools/misc/patchelf) { patchelf = (import ../development/tools/misc/patchelf) {
@ -492,7 +498,9 @@ rec {
langF77 = false; langF77 = false;
langCC = false; langCC = false;
}; };
inherit (stdenv.gcc) binutils glibc; #inherit (stdenv.gcc) binutils glibc;
inherit (stdenv.gcc) glibc;
binutils = binutilsArm;
inherit stdenv; inherit stdenv;
}; };
gcc40 = (import ../build-support/gcc-wrapper) { gcc40 = (import ../build-support/gcc-wrapper) {
@ -1424,6 +1432,13 @@ rec {
inherit fetchurl stdenv; inherit fetchurl stdenv;
}; };
#dietlibcArm = (import ../os-specific/linux/dietlibc-cross) {
# inherit fetchurl stdenv;
# gccCross = gcc40arm;
# binutilsCross = binutilsArm;
# arch = "arm";
#};
dietlibcWrapper = (import ../os-specific/linux/dietlibc-wrapper) { dietlibcWrapper = (import ../os-specific/linux/dietlibc-wrapper) {
inherit stdenv dietlibc; inherit stdenv dietlibc;
gcc = stdenv.gcc; gcc = stdenv.gcc;