diff options
| author | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-14 10:23:13 +0200 |
|---|---|---|
| committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-05-14 10:23:13 +0200 |
| commit | 8abe5ee07ee6b23fb014709f01bb161a62407a44 (patch) | |
| tree | 23fe6fb06258812145de6c5c2c41bf83b887af72 /pkgs/development/compilers/ghc/head.nix | |
| parent | ef0dbef7f15f962f9fedfd86563664bc95e6e2f9 (diff) | |
| parent | f2affe03443d916d1c693dc246e48985bc2222d4 (diff) | |
| download | nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.gz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.bz2 nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.lz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.xz nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.tar.zst nixpkgs-8abe5ee07ee6b23fb014709f01bb161a62407a44.zip | |
Merge master into staging-next
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 88b273500dc..46d8dfafd0f 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/ |