2016-12-16 13:22:02 +00:00
|
|
|
{ lib
|
2018-12-05 03:06:46 +00:00
|
|
|
, localSystem, crossSystem, config, overlays, crossOverlays ? []
|
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;
|
2018-12-05 03:06:46 +00:00
|
|
|
|
|
|
|
|
crossSystem = localSystem;
|
|
|
|
|
crossOverlays = [];
|
|
|
|
|
|
2023-05-20 02:11:55 +00:00
|
|
|
# Ignore custom stdenvs when cross compiling for compatibility
|
2023-11-23 16:46:58 +00:00
|
|
|
# Use replaceCrossStdenv instead.
|
2016-04-27 16:09:27 +00:00
|
|
|
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 01:47:48 +00:00
|
|
|
stdenv =
|
2018-08-20 18:43:41 +00:00
|
|
|
assert vanillaPackages.stdenv.buildPlatform == localSystem;
|
|
|
|
|
assert vanillaPackages.stdenv.hostPlatform == localSystem;
|
|
|
|
|
assert vanillaPackages.stdenv.targetPlatform == localSystem;
|
2017-07-06 01:47:48 +00:00
|
|
|
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
|
2021-08-20 06:03:45 +00:00
|
|
|
(buildPackages: let
|
|
|
|
|
adaptStdenv =
|
|
|
|
|
if crossSystem.isStatic
|
|
|
|
|
then buildPackages.stdenvAdapters.makeStatic
|
|
|
|
|
else lib.id;
|
Clean up cross bootstrapping
For a long time, we've had `crossLibcStdenv`, `*Cross` libc attributes,
and `*bsdCross` pre-libc package sets. This was always bad because
having "cross" things is "not declarative": the naming doesn't reflect
what packages *need* but rather how we *provide* something. This is
ugly, and creates needless friction between cross and native building.
Now, almost all of these `*Cross` attributes are gone: just these are
kept:
- Glibc's and Musl's are kept, because those packages are widely used
and I didn't want to risk changing the native builds of those at this
time.
- generic `libcCross`, `theadsCross`, and friends, because these relate
to the convolulted GCC bootstrap which still needs to be redone.
The BSD and obscure Linux or freestnanding libcs have conversely all
been made to use a new `stdenvNoLibc`, which is like the old
`crossLibcStdenv` except:
1. It usable for native and cross alike
2. It named according to what it *is* ("a standard environment without
libc but with a C compiler"), rather than some non-compositional
jargon ("the stdenv used for building libc when cross compiling",
yuck).
I should have done this change long ago, but I was stymied because of
"infinite recursions". The problem was that in too many cases we are
overriding `stdenv` to *remove* things we don't need, and this risks
cyles since those more minimal stdenvs are used to build things in the
more maximal stdenvs.
The solution is to pass `stage.nix` `stdenvNoCC`, so we can override to
*build up* rather than *tear down*. For now, the full `stdenv` is also
passed, so I don't need to change the native bootstraps, but I can see
this changing as we make things more uniform and clean those up.
(adapted from commit 51f1ecaa59a3b7c182b24e71a3176c83d6cd601e)
(adapted from commit 1743662e55669081056743f22f6e616588061cba)
2024-06-18 16:38:21 +00:00
|
|
|
stdenvNoCC = adaptStdenv (buildPackages.stdenv.override (old: rec {
|
|
|
|
|
buildPlatform = localSystem;
|
|
|
|
|
hostPlatform = crossSystem;
|
|
|
|
|
targetPlatform = crossSystem;
|
|
|
|
|
|
|
|
|
|
# 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
|
|
|
|
|
allowedRequisites = null;
|
|
|
|
|
|
|
|
|
|
cc = null;
|
|
|
|
|
hasCC = false;
|
|
|
|
|
|
|
|
|
|
extraNativeBuildInputs = old.extraNativeBuildInputs
|
|
|
|
|
++ lib.optionals
|
|
|
|
|
(hostPlatform.isLinux && !buildPlatform.isLinux)
|
|
|
|
|
[ buildPackages.patchelf ]
|
|
|
|
|
++ lib.optional
|
|
|
|
|
(let f = p: !p.isx86 || builtins.elem p.libc [ "musl" "wasilibc" "relibc" ] || p.isiOS || p.isGenode;
|
|
|
|
|
in f hostPlatform && !(f buildPlatform) )
|
|
|
|
|
buildPackages.updateAutotoolsGnuConfigScriptsHook
|
|
|
|
|
;
|
|
|
|
|
}));
|
2021-08-20 06:03:45 +00:00
|
|
|
in {
|
2018-12-05 03:06:46 +00:00
|
|
|
inherit config;
|
2021-08-20 06:03:45 +00:00
|
|
|
overlays = overlays ++ crossOverlays;
|
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;
|
Clean up cross bootstrapping
For a long time, we've had `crossLibcStdenv`, `*Cross` libc attributes,
and `*bsdCross` pre-libc package sets. This was always bad because
having "cross" things is "not declarative": the naming doesn't reflect
what packages *need* but rather how we *provide* something. This is
ugly, and creates needless friction between cross and native building.
Now, almost all of these `*Cross` attributes are gone: just these are
kept:
- Glibc's and Musl's are kept, because those packages are widely used
and I didn't want to risk changing the native builds of those at this
time.
- generic `libcCross`, `theadsCross`, and friends, because these relate
to the convolulted GCC bootstrap which still needs to be redone.
The BSD and obscure Linux or freestnanding libcs have conversely all
been made to use a new `stdenvNoLibc`, which is like the old
`crossLibcStdenv` except:
1. It usable for native and cross alike
2. It named according to what it *is* ("a standard environment without
libc but with a C compiler"), rather than some non-compositional
jargon ("the stdenv used for building libc when cross compiling",
yuck).
I should have done this change long ago, but I was stymied because of
"infinite recursions". The problem was that in too many cases we are
overriding `stdenv` to *remove* things we don't need, and this risks
cyles since those more minimal stdenvs are used to build things in the
more maximal stdenvs.
The solution is to pass `stage.nix` `stdenvNoCC`, so we can override to
*build up* rather than *tear down*. For now, the full `stdenv` is also
passed, so I don't need to change the native bootstraps, but I can see
this changing as we make things more uniform and clean those up.
(adapted from commit 51f1ecaa59a3b7c182b24e71a3176c83d6cd601e)
(adapted from commit 1743662e55669081056743f22f6e616588061cba)
2024-06-18 16:38:21 +00:00
|
|
|
inherit stdenvNoCC;
|
2023-11-23 16:46:58 +00:00
|
|
|
stdenv = let
|
Clean up cross bootstrapping
For a long time, we've had `crossLibcStdenv`, `*Cross` libc attributes,
and `*bsdCross` pre-libc package sets. This was always bad because
having "cross" things is "not declarative": the naming doesn't reflect
what packages *need* but rather how we *provide* something. This is
ugly, and creates needless friction between cross and native building.
Now, almost all of these `*Cross` attributes are gone: just these are
kept:
- Glibc's and Musl's are kept, because those packages are widely used
and I didn't want to risk changing the native builds of those at this
time.
- generic `libcCross`, `theadsCross`, and friends, because these relate
to the convolulted GCC bootstrap which still needs to be redone.
The BSD and obscure Linux or freestnanding libcs have conversely all
been made to use a new `stdenvNoLibc`, which is like the old
`crossLibcStdenv` except:
1. It usable for native and cross alike
2. It named according to what it *is* ("a standard environment without
libc but with a C compiler"), rather than some non-compositional
jargon ("the stdenv used for building libc when cross compiling",
yuck).
I should have done this change long ago, but I was stymied because of
"infinite recursions". The problem was that in too many cases we are
overriding `stdenv` to *remove* things we don't need, and this risks
cyles since those more minimal stdenvs are used to build things in the
more maximal stdenvs.
The solution is to pass `stage.nix` `stdenvNoCC`, so we can override to
*build up* rather than *tear down*. For now, the full `stdenv` is also
passed, so I don't need to change the native bootstraps, but I can see
this changing as we make things more uniform and clean those up.
(adapted from commit 51f1ecaa59a3b7c182b24e71a3176c83d6cd601e)
(adapted from commit 1743662e55669081056743f22f6e616588061cba)
2024-06-18 16:38:21 +00:00
|
|
|
inherit (stdenvNoCC) hostPlatform targetPlatform;
|
|
|
|
|
baseStdenv = stdenvNoCC.override {
|
|
|
|
|
# Old ones run on wrong platform
|
|
|
|
|
extraBuildInputs = lib.optionals hostPlatform.isDarwin [
|
2024-08-21 11:50:34 +00:00
|
|
|
buildPackages.targetPackages.apple-sdk
|
Clean up cross bootstrapping
For a long time, we've had `crossLibcStdenv`, `*Cross` libc attributes,
and `*bsdCross` pre-libc package sets. This was always bad because
having "cross" things is "not declarative": the naming doesn't reflect
what packages *need* but rather how we *provide* something. This is
ugly, and creates needless friction between cross and native building.
Now, almost all of these `*Cross` attributes are gone: just these are
kept:
- Glibc's and Musl's are kept, because those packages are widely used
and I didn't want to risk changing the native builds of those at this
time.
- generic `libcCross`, `theadsCross`, and friends, because these relate
to the convolulted GCC bootstrap which still needs to be redone.
The BSD and obscure Linux or freestnanding libcs have conversely all
been made to use a new `stdenvNoLibc`, which is like the old
`crossLibcStdenv` except:
1. It usable for native and cross alike
2. It named according to what it *is* ("a standard environment without
libc but with a C compiler"), rather than some non-compositional
jargon ("the stdenv used for building libc when cross compiling",
yuck).
I should have done this change long ago, but I was stymied because of
"infinite recursions". The problem was that in too many cases we are
overriding `stdenv` to *remove* things we don't need, and this risks
cyles since those more minimal stdenvs are used to build things in the
more maximal stdenvs.
The solution is to pass `stage.nix` `stdenvNoCC`, so we can override to
*build up* rather than *tear down*. For now, the full `stdenv` is also
passed, so I don't need to change the native bootstraps, but I can see
this changing as we make things more uniform and clean those up.
(adapted from commit 51f1ecaa59a3b7c182b24e71a3176c83d6cd601e)
(adapted from commit 1743662e55669081056743f22f6e616588061cba)
2024-06-18 16:38:21 +00:00
|
|
|
];
|
2018-07-24 20:46:52 +00:00
|
|
|
|
Clean up cross bootstrapping
For a long time, we've had `crossLibcStdenv`, `*Cross` libc attributes,
and `*bsdCross` pre-libc package sets. This was always bad because
having "cross" things is "not declarative": the naming doesn't reflect
what packages *need* but rather how we *provide* something. This is
ugly, and creates needless friction between cross and native building.
Now, almost all of these `*Cross` attributes are gone: just these are
kept:
- Glibc's and Musl's are kept, because those packages are widely used
and I didn't want to risk changing the native builds of those at this
time.
- generic `libcCross`, `theadsCross`, and friends, because these relate
to the convolulted GCC bootstrap which still needs to be redone.
The BSD and obscure Linux or freestnanding libcs have conversely all
been made to use a new `stdenvNoLibc`, which is like the old
`crossLibcStdenv` except:
1. It usable for native and cross alike
2. It named according to what it *is* ("a standard environment without
libc but with a C compiler"), rather than some non-compositional
jargon ("the stdenv used for building libc when cross compiling",
yuck).
I should have done this change long ago, but I was stymied because of
"infinite recursions". The problem was that in too many cases we are
overriding `stdenv` to *remove* things we don't need, and this risks
cyles since those more minimal stdenvs are used to build things in the
more maximal stdenvs.
The solution is to pass `stage.nix` `stdenvNoCC`, so we can override to
*build up* rather than *tear down*. For now, the full `stdenv` is also
passed, so I don't need to change the native bootstraps, but I can see
this changing as we make things more uniform and clean those up.
(adapted from commit 51f1ecaa59a3b7c182b24e71a3176c83d6cd601e)
(adapted from commit 1743662e55669081056743f22f6e616588061cba)
2024-06-18 16:38:21 +00:00
|
|
|
hasCC = !stdenvNoCC.targetPlatform.isGhcjs;
|
2019-11-24 23:07:20 +00:00
|
|
|
|
2023-11-23 16:46:58 +00:00
|
|
|
cc = if crossSystem.useiOSPrebuilt or false
|
|
|
|
|
then buildPackages.darwin.iosSdkPkgs.clang
|
|
|
|
|
else if crossSystem.useAndroidPrebuilt or false
|
2024-07-25 15:53:17 +00:00
|
|
|
then buildPackages."androidndkPkgs_${crossSystem.androidNdkVersion}".clang
|
2023-11-23 16:46:58 +00:00
|
|
|
else if targetPlatform.isGhcjs
|
|
|
|
|
# Need to use `throw` so tryEval for splicing works, ugh. Using
|
|
|
|
|
# `null` or skipping the attribute would cause an eval failure
|
|
|
|
|
# `tryEval` wouldn't catch, wrecking accessing previous stages
|
|
|
|
|
# when there is a C compiler and everything should be fine.
|
|
|
|
|
then throw "no C compiler provided for this platform"
|
|
|
|
|
else if crossSystem.isDarwin
|
|
|
|
|
then buildPackages.llvmPackages.libcxxClang
|
|
|
|
|
else if crossSystem.useLLVM or false
|
|
|
|
|
then buildPackages.llvmPackages.clang
|
2024-06-07 14:58:39 +00:00
|
|
|
else if crossSystem.useZig or false
|
|
|
|
|
then buildPackages.zig.cc
|
2024-07-01 02:01:07 +00:00
|
|
|
else if crossSystem.useArocc or false
|
|
|
|
|
then buildPackages.arocc
|
2023-11-23 16:46:58 +00:00
|
|
|
else buildPackages.gcc;
|
2018-07-24 20:46:52 +00:00
|
|
|
|
Clean up cross bootstrapping
For a long time, we've had `crossLibcStdenv`, `*Cross` libc attributes,
and `*bsdCross` pre-libc package sets. This was always bad because
having "cross" things is "not declarative": the naming doesn't reflect
what packages *need* but rather how we *provide* something. This is
ugly, and creates needless friction between cross and native building.
Now, almost all of these `*Cross` attributes are gone: just these are
kept:
- Glibc's and Musl's are kept, because those packages are widely used
and I didn't want to risk changing the native builds of those at this
time.
- generic `libcCross`, `theadsCross`, and friends, because these relate
to the convolulted GCC bootstrap which still needs to be redone.
The BSD and obscure Linux or freestnanding libcs have conversely all
been made to use a new `stdenvNoLibc`, which is like the old
`crossLibcStdenv` except:
1. It usable for native and cross alike
2. It named according to what it *is* ("a standard environment without
libc but with a C compiler"), rather than some non-compositional
jargon ("the stdenv used for building libc when cross compiling",
yuck).
I should have done this change long ago, but I was stymied because of
"infinite recursions". The problem was that in too many cases we are
overriding `stdenv` to *remove* things we don't need, and this risks
cyles since those more minimal stdenvs are used to build things in the
more maximal stdenvs.
The solution is to pass `stage.nix` `stdenvNoCC`, so we can override to
*build up* rather than *tear down*. For now, the full `stdenv` is also
passed, so I don't need to change the native bootstraps, but I can see
this changing as we make things more uniform and clean those up.
(adapted from commit 51f1ecaa59a3b7c182b24e71a3176c83d6cd601e)
(adapted from commit 1743662e55669081056743f22f6e616588061cba)
2024-06-18 16:38:21 +00:00
|
|
|
};
|
2023-11-23 16:46:58 +00:00
|
|
|
in if config ? replaceCrossStdenv then config.replaceCrossStdenv { inherit buildPackages baseStdenv; } else baseStdenv;
|
2016-12-16 13:22:02 +00:00
|
|
|
})
|
2016-11-15 21:31:55 +00:00
|
|
|
|
2016-12-16 13:22:02 +00:00
|
|
|
]
|