Skip to content

Native aarch64 support #620

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Jun 4, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 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
6 changes: 3 additions & 3 deletions compiler/old-ghc-nix/old-ghc-nix.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"url": "https://github.com/angerman/old-ghc-nix",
"rev": "bf640c1a3f55203bb7492a366c6492ff3c211332",
"date": "2020-02-27T19:53:36+08:00",
"sha256": "050g06911rpmvn66y5lmnszswz17flw3b979imdchc2apji6a1sm",
"rev": "2a41a09127f6dc7a6384823d1acd51ba257f95bd",
"date": "2020-06-03T12:50:09+08:00",
"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