Rename hostDrv -> crossDrv, buildDrv -> nativeDrv
This is for consistency with terminology in stdenv (and the terms "hostDrv" and "buildDrv" are not very intuitive, even if they're consistent with GNU terminology).
This commit is contained in:
@@ -16,7 +16,7 @@ let
|
||||
inherit fetchgit stdenv autoconf libtool texinfo
|
||||
glibcCross hurdPartedCross;
|
||||
inherit (gnu) machHeaders mig;
|
||||
libuuid = libuuid.hostDrv;
|
||||
libuuid = libuuid.crossDrv;
|
||||
automake = automake111x;
|
||||
headersOnly = false;
|
||||
cross = assert crossSystem != null; crossSystem;
|
||||
@@ -85,7 +85,7 @@ let
|
||||
stdenv = (forceSystem "i686-linux").stdenv;
|
||||
};
|
||||
|
||||
# XXX: Use this one for its `.hostDrv'. Using the one above from
|
||||
# XXX: Use this one for its `.crossDrv'. Using the one above from
|
||||
# `x86_64-linux' leads to building a different cross-toolchain because of
|
||||
# the `forceSystem'.
|
||||
mig_raw = callPackage ./mig {};
|
||||
|
||||
@@ -25,7 +25,7 @@ stdenv.mkDerivation {
|
||||
postInstall =
|
||||
# Fix the shebang to point to the cross-built shell.
|
||||
'' sed -i "$out/bin/mig" \
|
||||
-e 's|^#!/.*|#!${bash.hostDrv}/bin/sh|g'
|
||||
-e 's|^#!/.*|#!${bash.crossDrv}/bin/sh|g'
|
||||
'';
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user