ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2024-12-26 04:43:09 +03:00
Code Issues Projects Releases Wiki Activity

Adding armv5tel to the 'if' checks in stdenv, gcc-wrapper and kernel headers

Browse Source 
svn path=/nixpkgs/trunk/; revision=16466
This commit is contained in:
Lluís Batlle i Rossell 2009-07-26 21:48:10 +00:00
parent dcf0a95a72
commit 532fc4a05d
5 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
pkgs/build-support/gcc-wrapper/default.nix
View File

@ -54,6 +54,7 @@ stdenv.mkDerivation {
if !nativeLibc then if !nativeLibc then
(if stdenv.system == "i686-linux" then "ld-linux.so.2" else (if stdenv.system == "i686-linux" then "ld-linux.so.2" else
if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else if stdenv.system == "x86_64-linux" then "ld-linux-x86-64.so.2" else
if stdenv.system == "armv5tel-linux" then "ld-linux.so.3" else
if stdenv.system == "powerpc-linux" then "ld.so.1" else if stdenv.system == "powerpc-linux" then "ld.so.1" else
abort "don't know the name of the dynamic linker for this platform") abort "don't know the name of the dynamic linker for this platform")
else ""; else "";

1
pkgs/os-specific/linux/kernel-headers/2.6.28.nix
View File

@ -16,6 +16,7 @@ stdenv.mkDerivation {
if stdenv.system == "i686-linux" then "i386" else if stdenv.system == "i686-linux" then "i386" else
if stdenv.system == "x86_64-linux" then "x86_64" else if stdenv.system == "x86_64-linux" then "x86_64" else
if stdenv.system == "powerpc-linux" then "powerpc" else if stdenv.system == "powerpc-linux" then "powerpc" else
if stdenv.system == "armv5tel-linux" then "arm" else
abort "don't know what the kernel include directory is called for this platform"; abort "don't know what the kernel include directory is called for this platform";
buildInputs = [perl]; buildInputs = [perl];

1
pkgs/stdenv/default.nix
View File

@ -54,6 +54,7 @@ rec {
stdenv = stdenv =
if stdenvType == "i686-linux" then stdenvLinux else if stdenvType == "i686-linux" then stdenvLinux else
if stdenvType == "x86_64-linux" then stdenvLinux else if stdenvType == "x86_64-linux" then stdenvLinux else
if stdenvType == "armv5tel-linux" then stdenvNative else
if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else if stdenvType == "powerpc-linux" then /* stdenvLinux */ stdenvNative else
if stdenvType == "i686-mingw" then stdenvMinGW else if stdenvType == "i686-mingw" then stdenvMinGW else
if stdenvType == "i686-darwin" then stdenvNix else if stdenvType == "i686-darwin" then stdenvNix else

3
pkgs/stdenv/generic/default.nix
View File

@ -71,7 +71,8 @@ let
isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin"; isDarwin = result.system == "i686-darwin" || result.system == "powerpc-darwin";
isLinux = result.system == "i686-linux" isLinux = result.system == "i686-linux"
|| result.system == "x86_64-linux" || result.system == "x86_64-linux"
|| result.system == "powerpc-linux"; || result.system == "powerpc-linux"
|| result.system == "armv5tel-linux";
isi686 = result.system == "i686-linux" isi686 = result.system == "i686-linux"
|| result.system == "i686-darwin" || result.system == "i686-darwin"
|| result.system == "i686-freebsd"; || result.system == "i686-freebsd";

1
pkgs/stdenv/linux/default.nix
View File

@ -13,6 +13,7 @@ rec {
if system == "i686-linux" then import ./bootstrap/i686 if system == "i686-linux" then import ./bootstrap/i686
else if system == "x86_64-linux" then import ./bootstrap/x86_64 else if system == "x86_64-linux" then import ./bootstrap/x86_64
else if system == "powerpc-linux" then import ./bootstrap/powerpc else if system == "powerpc-linux" then import ./bootstrap/powerpc
else if system == "armv5tel-linux" then import ./bootstrap/armv5tel
else abort "unsupported platform for the pure Linux stdenv"; else abort "unsupported platform for the pure Linux stdenv";