diff options
| author | John Ericson <git@JohnEricson.me> | 2019-05-13 00:02:02 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-05-13 00:02:02 -0400 |
| commit | 59a733edae6c08ec88d007a0ebcdcdb8f906e3ff (patch) | |
| tree | 47b31a6aaf9caf0a2efafb2861a4c23969ea0907 /pkgs/development/compilers/ghc/head.nix | |
| parent | 1df1834dd1e47f9a1452fc271d7e0b4ba296e04d (diff) | |
| parent | 490d9fd50967707d575a5b40aee6b3d216aa7c5c (diff) | |
Merge pull request #61336 from matthewbauer/ghc-ncg-cross
Use ncg for x86 ghc cross compilation
Diffstat (limited to 'pkgs/development/compilers/ghc/head.nix')
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 88b273500dc0..46d8dfafd0fe 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -6,7 +6,7 @@ , libiconv ? null, ncurses -, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) +, useLLVM ? !stdenv.targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for # non-x86, we need LLVM to bootstrap later stages, so it becomes a # build-time dependency too. @@ -29,7 +29,8 @@ , version ? "8.7.20190115" , # What flavour to build. An empty string indicates no # specific flavour and falls back to ghc default values. - ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) "perf-cross" + ghcFlavour ? stdenv.lib.optionalString (stdenv.targetPlatform != stdenv.hostPlatform) + (if useLLVM then "perf-cross" else "perf-cross-ncg") , # Whether to disable the large address space allocator # necessary fix for iOS: https://www.reddit.com/r/haskell/comments/4ttdz1/building_an_osxi386_to_iosarm64_cross_compiler/d5qvd67/ |