about summary refs log tree commit diff
path: root/pkgs/stdenv/generic/default.nix
diff options
context:
space:
mode:
authorLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-17 21:14:57 +0000
committerLluís Batlle i Rossell <viric@vicerveza.homeunix.net>2009-11-17 21:14:57 +0000
commit0c631f61819e680bc689d432e6c67e4e0da294fb (patch)
treec5750e2126a7d4b268f21a4d5e1873aa5a1ccaf2 /pkgs/stdenv/generic/default.nix
parent2c7fa189fb2ac1c4ef689398ab13a4465448856a (diff)
Trying to move all stdenv cross-compiling details out of the stdenv expression,
into a stdenv adapater.


svn path=/nixpkgs/branches/stdenv-updates/; revision=18397
Diffstat (limited to 'pkgs/stdenv/generic/default.nix')
-rw-r--r--pkgs/stdenv/generic/default.nix4
1 files changed, 0 insertions, 4 deletions
diff --git a/pkgs/stdenv/generic/default.nix b/pkgs/stdenv/generic/default.nix
index a8eab154db4e1..de525d479f956 100644
--- a/pkgs/stdenv/generic/default.nix
+++ b/pkgs/stdenv/generic/default.nix
@@ -1,5 +1,4 @@
 { system, name, preHook ? null, postHook ? null, initialPath, gcc, shell
-, cross ? null
 , param1 ? "", param2 ? "", param3 ? "", param4 ? "", param5 ? ""
 , extraAttrs ? {}
 
@@ -53,9 +52,6 @@ let
                 ["-e" (if attrs ? builder then attrs.builder else ./default-builder.sh)];
               stdenv = result;
               system = result.system;
-              # The env variable 'cross' is used in all the crosscompiler
-              # bootstrapping in another sense
-              crossTarget = if (cross != null) then cross.config else null;
             })
           )
           # The meta attribute is passed in the resulting attribute set,