Skip to content

Commit

Permalink
native aarch64 support
Browse files Browse the repository at this point in the history
  • Loading branch information
TravisWhitaker committed May 28, 2020
1 parent 6c57d4f commit 6079f9d
Show file tree
Hide file tree
Showing 12 changed files with 1,942 additions and 16 deletions.
7 changes: 4 additions & 3 deletions compiler/ghc/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@

# build-tools
, bootPkgs
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx
, autoconf, automake, coreutils, fetchurl, fetchpatch, perl, python3, m4, sphinx, numactl
, autoreconfHook
, bash

Expand Down Expand Up @@ -116,7 +116,8 @@ let
libDeps = platform: stdenv.lib.optional enableTerminfo [ ncurses ]
++ [targetLibffi]
++ stdenv.lib.optional (!enableIntegerSimple) gmp
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv;
++ stdenv.lib.optional (platform.libc != "glibc" && !targetPlatform.isWindows) libiconv
++ stdenv.lib.optional platform.isLinux numactl;

toolsForTarget =
if hostPlatform == buildPlatform then
Expand Down Expand Up @@ -221,7 +222,7 @@ in let configured-src = stdenv.mkDerivation (rec {

outputs = [ "out" ];
phases = [ "unpackPhase" "patchPhase" ]
++ stdenv.lib.optional (ghc-patches != []) "autoreconfPhase"
# ++ stdenv.lib.optional (ghc-patches != []) "autoreconfPhase"
++ [ "configurePhase" "installPhase" ];
installPhase = "cp -r . $out";
});
Expand Down
7 changes: 3 additions & 4 deletions compiler/old-ghc-nix/old-ghc-nix.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
"url": "https://github.com/angerman/old-ghc-nix",
"rev": "bf640c1a3f55203bb7492a366c6492ff3c211332",
"date": "2020-02-27T19:53:36+08:00",
"sha256": "050g06911rpmvn66y5lmnszswz17flw3b979imdchc2apji6a1sm",
"url": "https://github.com/traviswhitaker/old-ghc-nix",
"rev": "0d136da6e48de6d1256c8aa2b281662e93f9e486",
"sha256": "1cp6aksb6ldgjb5zyqikyjrjij79n9z7wd86migph0wp19vmszkf",
"fetchSubmodules": false
}
1,591 changes: 1,591 additions & 0 deletions materialized/dummy-ghc/ghc-8.8.3-aarch64-linux/ghc-pkg/dump-global

Large diffs are not rendered by default.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

58 changes: 58 additions & 0 deletions materialized/dummy-ghc/ghc-8.8.3-aarch64-linux/ghc/info

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

247 changes: 247 additions & 0 deletions materialized/dummy-ghc/ghc-8.8.3-aarch64-linux/ghc/supported-languages

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion nix-tools/regenerate.nix
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,11 @@ in
# "stm" "terminfo"
];
}];
}).nix-tools.components.exes.plan-to-nix; in
}).nix-tools.components.exes.plan-to-nix;
bootstrap = if pkgs.targetPlatform.isAarch64
then haskell-nix.bootstrap.compiler.ghc882
else haskell-nix.bootstrap.compiler.ghc844;
in
with builtins;
with stdenv.lib;
writeShellScriptBin "update-nix-tools" ''
Expand Down
Loading

0 comments on commit 6079f9d

Please sign in to comment.