diff options
author | John Ericson <John.Ericson@Obsidian.Systems> | 2018-11-01 16:47:42 -0400 |
---|---|---|
committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-11-01 16:47:42 -0400 |
commit | e3082c313b75f13e8e1049673efe6a42dcd1499f (patch) | |
tree | 0d11815c9bed24ca9f27d3839ac0f9577d8308e5 /pkgs/top-level/release-cross.nix | |
parent | f2ed7c7af9f5b2db5e88b78e192b470c47f4c4fd (diff) | |
parent | cc41aefe4485dea399930b8d173c26e438cb5e22 (diff) | |
download | nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.gz nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.bz2 nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.lz nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.xz nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.tar.zst nixlib-e3082c313b75f13e8e1049673efe6a42dcd1499f.zip |
Merge remote-tracking branch 'upstream/master' into release-lib-cleanup
Diffstat (limited to 'pkgs/top-level/release-cross.nix')
-rw-r--r-- | pkgs/top-level/release-cross.nix | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/pkgs/top-level/release-cross.nix b/pkgs/top-level/release-cross.nix index ee69dd5a43c5..456bacb106b1 100644 --- a/pkgs/top-level/release-cross.nix +++ b/pkgs/top-level/release-cross.nix @@ -2,7 +2,7 @@ */ { # The platforms *from* which we cross compile. - supportedSystems ? [ "x86_64-linux" "x86_64-darwin" ] + supportedSystems ? [ "x86_64-linux" "x86_64-darwin" "aarch64-linux" ] , # Strip most of attributes when evaluating to spare memory usage scrubJobs ? true }: @@ -10,7 +10,13 @@ with import ./release-lib.nix { inherit supportedSystems scrubJobs; }; let - nativePlatforms = linux; + nativePlatforms = all; + + embedded = { + buildPackages.binutils = nativePlatforms; + buildPackages.gcc = nativePlatforms; + libcCross = nativePlatforms; + }; common = { buildPackages.binutils = nativePlatforms; @@ -134,12 +140,19 @@ in android64 = mapTestOnCross lib.systems.examples.aarch64-android-prebuilt (linuxCommon // { }); + avr = mapTestOnCross lib.systems.examples.avr embedded; + arm-embedded = mapTestOnCross lib.systems.examples.arm-embedded embedded; + powerpc-embedded = mapTestOnCross lib.systems.examples.powerpc-embedded embedded; + aarch64-embedded = mapTestOnCross lib.systems.examples.aarch64-embedded embedded; + i686-embedded = mapTestOnCross lib.systems.examples.i686-embedded embedded; + x86_64-embedded = mapTestOnCross lib.systems.examples.x86_64-embedded embedded; + /* Cross-built bootstrap tools for every supported platform */ bootstrapTools = let tools = import ../stdenv/linux/make-bootstrap-tools-cross.nix { system = "x86_64-linux"; }; maintainers = [ lib.maintainers.dezgeg ]; mkBootstrapToolsJob = drv: - assert lib.elem drv.system (supportedSystems ++ [ "aarch64-linux" ]); + assert lib.elem drv.system supportedSystems; hydraJob' (lib.addMetaAttrs { inherit maintainers; } drv); in lib.mapAttrsRecursiveCond (as: !lib.isDerivation as) (name: mkBootstrapToolsJob) tools; } |