cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2

haskell.compiler.*: don't useLLVM if aarch64-darwin NCG is available

Browse source 
aarch64-darwin NCG was added in 9.2.1 which makes it unnecessary to
include LLVM in the wrapper.
This commit is contained in:
sternenseemann 2021-11-25 19:30:05 +01:00
parent 50f256f5ef
commit ef081bf305
2 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
pkgs/development/compilers/ghc/9.2.1.nix
View file

@ -12,7 +12,8 @@
, # GHC can be built with system libffi or a bundled one. , # GHC can be built with system libffi or a bundled one.
libffi ? null libffi ? null
, useLLVM ? !stdenv.targetPlatform.isx86 , useLLVM ? !(stdenv.targetPlatform.isx86
|| (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin))
, # LLVM is conceptually a run-time-only depedendency, but for , # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a # non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too. # build-time dependency too.

3
pkgs/development/compilers/ghc/head.nix
View file

@ -17,7 +17,8 @@
!stdenv.targetPlatform.isWindows !stdenv.targetPlatform.isWindows
, elfutils # for DWARF support , elfutils # for DWARF support
, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS , useLLVM ? !(stdenv.targetPlatform.isx86
|| (stdenv.targetPlatform.isAarch64 && stdenv.targetPlatform.isDarwin))
, # LLVM is conceptually a run-time-only depedendency, but for , # LLVM is conceptually a run-time-only depedendency, but for
# non-x86, we need LLVM to bootstrap later stages, so it becomes a # non-x86, we need LLVM to bootstrap later stages, so it becomes a
# build-time dependency too. # build-time dependency too.