diff options
author | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-22 19:51:45 +0000 |
---|---|---|
committer | Lluís Batlle i Rossell <viric@vicerveza.homeunix.net> | 2009-11-22 19:51:45 +0000 |
commit | 585ba8c27f766a15abcab22c232170f6ae1cc0a9 (patch) | |
tree | 6b2411a130c9683b6696a63da584e56137029caf /pkgs/os-specific/linux/kernel-headers | |
parent | 9dcff09187d5e41ed9bf4d841243a4bf6082c719 (diff) | |
download | nixpkgs-585ba8c27f766a15abcab22c232170f6ae1cc0a9.tar nixpkgs-585ba8c27f766a15abcab22c232170f6ae1cc0a9.tar.gz nixpkgs-585ba8c27f766a15abcab22c232170f6ae1cc0a9.tar.bz2 nixpkgs-585ba8c27f766a15abcab22c232170f6ae1cc0a9.tar.lz nixpkgs-585ba8c27f766a15abcab22c232170f6ae1cc0a9.tar.xz nixpkgs-585ba8c27f766a15abcab22c232170f6ae1cc0a9.tar.zst nixpkgs-585ba8c27f766a15abcab22c232170f6ae1cc0a9.zip |
Big fixes in the cross build:
- Before this changes, cflags and ldflags for the native and the cross compiler got mixed. Not all the gcc-wrapper/gcc-cross-wrapper variables are independant now, but enough, I think. - Fixed the generic stdenv expression, which did a big mess on buildInputs and buildNativeInputs. Now it distinguishes when there is a stdenvCross or not. Maybe we should have a single stdenv and forget about the stdenvCross adapter - this could end in a stdenv a bit complex, but simpler than the generic stdenv + adapter. - Added basic support in pkgconfig for cross-builds: a single PKG_CONFIG_PATH now works for both the cross and the native compilers, but I think this should work well for most cases I can think of. - I tried to fix the guile expression to cross-biuld; guile is built, but not its manual, so the derivation still fails. Guile requires patching to cross-build, as far as I understnad. - Made the glibcCross build to be done through the usage of a gcc-cross-wrapper over the gcc-cross-stage-static, instead of using it directly. - Trying to make physfs (a neverball dependency) cross build. - Updated the gcc expression to support building a cross compiler without getting derivation variables mixed with those of the stdenvCross. svn path=/nixpkgs/branches/stdenv-updates/; revision=18534
Diffstat (limited to 'pkgs/os-specific/linux/kernel-headers')
-rw-r--r-- | pkgs/os-specific/linux/kernel-headers/2.6.28.nix | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix index 69849112d81..4392e894e96 100644 --- a/pkgs/os-specific/linux/kernel-headers/2.6.28.nix +++ b/pkgs/os-specific/linux/kernel-headers/2.6.28.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation { sha256 = "0hifjh75sinifr5138v22zwbpqln6lhn65k8b57a1dyzlqca7cl9"; }; - crossConfig = if (cross != null) then cross.config else null; + targetConfig = if (cross != null) then cross.config else null; platform = if cross != null then cross.arch else @@ -37,7 +37,7 @@ stdenv.mkDerivation { ''; buildPhase = '' - if test -n "$crossConfig"; then + if test -n "$targetConfig"; then export ARCH=$platform fi make mrproper headers_check |