diff options
| author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-17 21:14:57 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-17 21:14:57 +0000 |
| commit | 0c631f61819e680bc689d432e6c67e4e0da294fb (patch) | |
| tree | c5750e2126a7d4b268f21a4d5e1873aa5a1ccaf2 /pkgs/build-support | |
| parent | 2c7fa189fb2ac1c4ef689398ab13a4465448856a (diff) | |
| download | nixlib-0c631f61819e680bc689d432e6c67e4e0da294fb.tar nixlib-0c631f61819e680bc689d432e6c67e4e0da294fb.tar.gz nixlib-0c631f61819e680bc689d432e6c67e4e0da294fb.tar.bz2 nixlib-0c631f61819e680bc689d432e6c67e4e0da294fb.tar.lz nixlib-0c631f61819e680bc689d432e6c67e4e0da294fb.tar.xz nixlib-0c631f61819e680bc689d432e6c67e4e0da294fb.tar.zst nixlib-0c631f61819e680bc689d432e6c67e4e0da294fb.zip | |
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/build-support')
| -rw-r--r-- | pkgs/build-support/gcc-cross-wrapper/default.nix | 4 | ||||
| -rw-r--r-- | pkgs/build-support/gcc-cross-wrapper/setup-hook.sh | 3 |
2 files changed, 7 insertions, 0 deletions
diff --git a/pkgs/build-support/gcc-cross-wrapper/default.nix b/pkgs/build-support/gcc-cross-wrapper/default.nix index 8acdb8356c0d..a9042dddf195 100644 --- a/pkgs/build-support/gcc-cross-wrapper/default.nix +++ b/pkgs/build-support/gcc-cross-wrapper/default.nix @@ -30,4 +30,8 @@ stdenv.mkDerivation { meta = if gcc != null then gcc.meta else { description = "System C compiler wrapper"; }; + + passthru = { + inherit cross; + }; } diff --git a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh index 7a7ea8226919..e4034820fb3c 100644 --- a/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh +++ b/pkgs/build-support/gcc-cross-wrapper/setup-hook.sh @@ -23,3 +23,6 @@ fi if test -n "@glibc@"; then PATH=$PATH:@glibc@/bin fi + +configureFlags="$configureFlags --build=$system --host=$crossConfig" +dontStrip=1 |