diff options
| author | Will Dietz <github@wdtz.org> | 2018-07-12 10:48:04 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-07-12 10:48:04 -0500 |
| commit | 78381de8598c3d850749371d7582201ee898a0c3 (patch) | |
| tree | 4578411e75003375cf56ebbc3de51defbf8cd99e /pkgs/development/compilers | |
| parent | 6b5c9fc197895ad2f3b63b473168a5871670eee3 (diff) | |
| parent | 2996d29f71a5004ff2a1eaf5094bafb4cfbfa989 (diff) | |
| download | nixlib-78381de8598c3d850749371d7582201ee898a0c3.tar nixlib-78381de8598c3d850749371d7582201ee898a0c3.tar.gz nixlib-78381de8598c3d850749371d7582201ee898a0c3.tar.bz2 nixlib-78381de8598c3d850749371d7582201ee898a0c3.tar.lz nixlib-78381de8598c3d850749371d7582201ee898a0c3.tar.xz nixlib-78381de8598c3d850749371d7582201ee898a0c3.tar.zst nixlib-78381de8598c3d850749371d7582201ee898a0c3.zip | |
Merge pull request #43400 from dtzWill/experimental/ghc-musl-nollvm
ghc: don't use LLVM w/musl on non-cross
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.3.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.1.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index fefd07b12043..d740a7ee673b 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -8,7 +8,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl +, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # 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. diff --git a/pkgs/development/compilers/ghc/8.4.3.nix b/pkgs/development/compilers/ghc/8.4.3.nix index 12e01a159a21..182afa6b3496 100644 --- a/pkgs/development/compilers/ghc/8.4.3.nix +++ b/pkgs/development/compilers/ghc/8.4.3.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl +, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # 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. diff --git a/pkgs/development/compilers/ghc/8.6.1.nix b/pkgs/development/compilers/ghc/8.6.1.nix index 9627e87f8bde..fb294d1fdbaf 100644 --- a/pkgs/development/compilers/ghc/8.6.1.nix +++ b/pkgs/development/compilers/ghc/8.6.1.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl +, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # 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. diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 43e6473fc241..4c1e5d986dcf 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,7 +7,7 @@ , libffi, libiconv ? null, ncurses -, useLLVM ? !targetPlatform.isx86 || targetPlatform.isMusl +, useLLVM ? !targetPlatform.isx86 || (targetPlatform.isMusl && hostPlatform != targetPlatform) , # 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. |