2016-12-16 13:22:02 +00:00
|
|
|
{ lib
|
2016-12-24 18:55:11 +00:00
|
|
|
, localSystem, crossSystem, config, overlays
|
2016-11-27 20:37:45 +00:00
|
|
|
}:
|
2016-11-07 05:27:38 +00:00
|
|
|
|
2016-12-16 13:22:02 +00:00
|
|
|
let
|
|
|
|
|
bootStages = import ../. {
|
2016-12-24 18:55:11 +00:00
|
|
|
inherit lib localSystem overlays;
|
2016-11-07 05:27:38 +00:00
|
|
|
crossSystem = null;
|
2016-04-27 17:09:27 +01:00
|
|
|
# Ignore custom stdenvs when cross compiling for compatability
|
|
|
|
|
config = builtins.removeAttrs config [ "replaceStdenv" ];
|
2016-11-11 14:34:24 +00:00
|
|
|
};
|
2016-11-07 05:27:38 +00:00
|
|
|
|
2018-03-19 20:25:54 +00:00
|
|
|
in lib.init bootStages ++ [
|
2016-12-16 13:22:02 +00:00
|
|
|
|
2018-03-19 20:25:54 +00:00
|
|
|
# Regular native packages
|
|
|
|
|
(somePrevStage: lib.last bootStages somePrevStage // {
|
|
|
|
|
# It's OK to change the built-time dependencies
|
|
|
|
|
allowCustomOverrides = true;
|
|
|
|
|
})
|
|
|
|
|
|
|
|
|
|
# Build tool Packages
|
2016-12-16 13:22:02 +00:00
|
|
|
(vanillaPackages: {
|
2016-12-24 18:55:11 +00:00
|
|
|
inherit config overlays;
|
2016-12-26 22:32:14 +00:00
|
|
|
selfBuild = false;
|
2017-07-06 02:47:48 +01:00
|
|
|
stdenv =
|
|
|
|
|
assert vanillaPackages.hostPlatform == localSystem;
|
|
|
|
|
assert vanillaPackages.targetPlatform == localSystem;
|
|
|
|
|
vanillaPackages.stdenv.override { targetPlatform = crossSystem; };
|
2016-11-07 05:27:38 +00:00
|
|
|
# It's OK to change the built-time dependencies
|
|
|
|
|
allowCustomOverrides = true;
|
2016-12-16 13:22:02 +00:00
|
|
|
})
|
2016-11-07 05:27:38 +00:00
|
|
|
|
top-level: Introduce `buildPackages` for resolving build-time deps
[N.B., this package also applies to the commits that follow it in the same
PR.]
In most cases, buildPackages = pkgs so things work just as before. For
cross compiling, however, buildPackages is resolved as the previous
bootstrapping stage. This allows us to avoid the mkDerivation hacks cross
compiling currently uses today.
To avoid a massive refactor, callPackage will splice together both package
sets. Again to avoid churn, it uses the old `nativeDrv` vs `crossDrv` to do
so. So now, whether cross compiling or not, packages with get a `nativeDrv`
and `crossDrv`---in the non-cross-compiling case they are simply the same
derivation. This is good because it reduces the divergence between the
cross and non-cross dataflow. See `pkgs/top-level/splice.nix` for a comment
along the lines of the preceding paragraph, and the code that does this
splicing.
Also, `forceNativeDrv` is replaced with `forceNativePackages`. The latter
resolves `pkgs` unless the host platform is different from the build
platform, in which case it resolves to `buildPackages`. Note that the
target platform is not important here---it will not prevent
`forcedNativePackages` from resolving to `pkgs`.
--------
Temporarily, we make preserve some dubious decisions in the name of preserving
hashes:
Most importantly, we don't distinguish between "host" and "target" in the
autoconf sense. This leads to the proliferation of *Cross derivations
currently used. What we ought to is resolve native deps of the cross "build
packages" (build = host != target) package set against the "vanilla
packages" (build = host = target) package set. Instead, "build packages"
uses itself, with (informally) target != build in all cases.
This is wrong because it violates the "sliding window" principle of
bootstrapping stages that shifting the platform triple of one stage to the
left coincides with the next stage's platform triple. Only because we don't
explicitly distinguish between "host" and "target" does it appear that the
"sliding window" principle is preserved--indeed it is over the reductionary
"platform double" of just "build" and "host/target".
Additionally, we build libc, libgcc, etc in the same stage as the compilers
themselves, which is wrong because they are used at runtime, not build
time. Fixing this is somewhat subtle, and the solution and problem will be
better explained in the commit that does fix it.
Commits after this will solve both these issues, at the expense of breaking
cross hashes. Native hashes won't be broken, thankfully.
--------
Did the temporary ugliness pan out? Of the packages that currently build in
`release-cross.nix`, the only ones that have their hash changed are
`*.gcc.crossDrv` and `bootstrapTools.*.coreutilsMinimal`. In both cases I
think it doesn't matter.
1. GCC when doing a `build = host = target = foreign` build (maximally
cross), still defines environment variables like `CPATH`[1] with
packages. This seems assuredly wrong because whether gcc dynamically
links those, or the programs built by gcc dynamically link those---I
have no idea which case is reality---they should be foreign. Therefore,
in all likelihood, I just made the gcc less broken.
2. Coreutils (ab)used the old cross-compiling infrastructure to depend on
a native version of itself. When coreutils was overwritten to be built
with fewer features, the native version it used would also be
overwritten because the binding was tight. Now it uses the much looser
`BuildPackages.coreutils` which is just fine as a richer build dep
doesn't cause any problems and avoids a rebuild.
So, in conclusion I'd say the conservatism payed off. Onward to actually
raking the muck in the next PR!
[1]: https://gcc.gnu.org/onlinedocs/gcc/Environment-Variables.html
2016-12-18 07:51:18 +00:00
|
|
|
# Run Packages
|
2016-12-16 13:22:02 +00:00
|
|
|
(buildPackages: {
|
2016-12-24 18:55:11 +00:00
|
|
|
inherit config overlays;
|
top-level: Introduce `buildPackages` for resolving build-time deps
[N.B., this package also applies to the commits that follow it in the same
PR.]
In most cases, buildPackages = pkgs so things work just as before. For
cross compiling, however, buildPackages is resolved as the previous
bootstrapping stage. This allows us to avoid the mkDerivation hacks cross
compiling currently uses today.
To avoid a massive refactor, callPackage will splice together both package
sets. Again to avoid churn, it uses the old `nativeDrv` vs `crossDrv` to do
so. So now, whether cross compiling or not, packages with get a `nativeDrv`
and `crossDrv`---in the non-cross-compiling case they are simply the same
derivation. This is good because it reduces the divergence between the
cross and non-cross dataflow. See `pkgs/top-level/splice.nix` for a comment
along the lines of the preceding paragraph, and the code that does this
splicing.
Also, `forceNativeDrv` is replaced with `forceNativePackages`. The latter
resolves `pkgs` unless the host platform is different from the build
platform, in which case it resolves to `buildPackages`. Note that the
target platform is not important here---it will not prevent
`forcedNativePackages` from resolving to `pkgs`.
--------
Temporarily, we make preserve some dubious decisions in the name of preserving
hashes:
Most importantly, we don't distinguish between "host" and "target" in the
autoconf sense. This leads to the proliferation of *Cross derivations
currently used. What we ought to is resolve native deps of the cross "build
packages" (build = host != target) package set against the "vanilla
packages" (build = host = target) package set. Instead, "build packages"
uses itself, with (informally) target != build in all cases.
This is wrong because it violates the "sliding window" principle of
bootstrapping stages that shifting the platform triple of one stage to the
left coincides with the next stage's platform triple. Only because we don't
explicitly distinguish between "host" and "target" does it appear that the
"sliding window" principle is preserved--indeed it is over the reductionary
"platform double" of just "build" and "host/target".
Additionally, we build libc, libgcc, etc in the same stage as the compilers
themselves, which is wrong because they are used at runtime, not build
time. Fixing this is somewhat subtle, and the solution and problem will be
better explained in the commit that does fix it.
Commits after this will solve both these issues, at the expense of breaking
cross hashes. Native hashes won't be broken, thankfully.
--------
Did the temporary ugliness pan out? Of the packages that currently build in
`release-cross.nix`, the only ones that have their hash changed are
`*.gcc.crossDrv` and `bootstrapTools.*.coreutilsMinimal`. In both cases I
think it doesn't matter.
1. GCC when doing a `build = host = target = foreign` build (maximally
cross), still defines environment variables like `CPATH`[1] with
packages. This seems assuredly wrong because whether gcc dynamically
links those, or the programs built by gcc dynamically link those---I
have no idea which case is reality---they should be foreign. Therefore,
in all likelihood, I just made the gcc less broken.
2. Coreutils (ab)used the old cross-compiling infrastructure to depend on
a native version of itself. When coreutils was overwritten to be built
with fewer features, the native version it used would also be
overwritten because the binding was tight. Now it uses the much looser
`BuildPackages.coreutils` which is just fine as a richer build dep
doesn't cause any problems and avoids a rebuild.
So, in conclusion I'd say the conservatism payed off. Onward to actually
raking the muck in the next PR!
[1]: https://gcc.gnu.org/onlinedocs/gcc/Environment-Variables.html
2016-12-18 07:51:18 +00:00
|
|
|
selfBuild = false;
|
2018-07-24 21:46:52 +01:00
|
|
|
stdenv = buildPackages.stdenv.override (old: rec {
|
2017-04-26 05:06:11 +01:00
|
|
|
buildPlatform = localSystem;
|
|
|
|
|
hostPlatform = crossSystem;
|
|
|
|
|
targetPlatform = crossSystem;
|
2018-07-24 21:46:52 +01:00
|
|
|
|
|
|
|
|
# Prior overrides are surely not valid as packages built with this run on
|
|
|
|
|
# a different platform, and so are disabled.
|
|
|
|
|
overrides = _: _: {};
|
|
|
|
|
extraBuildInputs = [ ]; # Old ones run on wrong platform
|
2018-07-25 08:55:09 +01:00
|
|
|
allowedRequisites = null;
|
2018-07-24 21:46:52 +01:00
|
|
|
|
2018-04-16 00:21:45 +01:00
|
|
|
cc = if crossSystem.useiOSPrebuilt or false
|
|
|
|
|
then buildPackages.darwin.iosSdkPkgs.clang
|
2018-06-22 14:33:25 +01:00
|
|
|
else if crossSystem.useAndroidPrebuilt
|
2018-06-22 15:21:43 +01:00
|
|
|
then buildPackages.androidenv."androidndkPkgs_${crossSystem.ndkVer}".gcc
|
2017-09-20 20:31:07 +01:00
|
|
|
else buildPackages.gcc;
|
2018-07-24 21:46:52 +01:00
|
|
|
|
|
|
|
|
extraNativeBuildInputs = old.extraNativeBuildInputs
|
|
|
|
|
# without proper `file` command, libtool sometimes fails
|
|
|
|
|
# to recognize 64-bit DLLs
|
|
|
|
|
++ lib.optional (hostPlatform.config == "x86_64-w64-mingw32") buildPackages.file
|
|
|
|
|
++ lib.optional
|
|
|
|
|
(hostPlatform.isAarch64 || hostPlatform.isMips || hostPlatform.libc == "musl")
|
|
|
|
|
buildPackages.updateAutotoolsGnuConfigScriptsHook
|
|
|
|
|
;
|
|
|
|
|
});
|
2016-12-16 13:22:02 +00:00
|
|
|
})
|
2016-11-15 21:31:55 +00:00
|
|
|
|
2016-12-16 13:22:02 +00:00
|
|
|
]
|
