diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2020-01-03 15:35:41 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-01-03 15:35:41 -0500 |
| commit | 04000331c10f4fffdb24043a929ee5416e36eda5 (patch) | |
| tree | 2772124fdb5e4d961dd6be5ee0d498e5e54a6b64 /pkgs/development/compilers/ghc | |
| parent | 9e0847e566b2153299c0a40201cbe5589a7d43b1 (diff) | |
| parent | 9c1a2ac51e365d7ef78315bb8eb24874823a6176 (diff) | |
| download | nixpkgs-04000331c10f4fffdb24043a929ee5416e36eda5.tar nixpkgs-04000331c10f4fffdb24043a929ee5416e36eda5.tar.gz nixpkgs-04000331c10f4fffdb24043a929ee5416e36eda5.tar.bz2 nixpkgs-04000331c10f4fffdb24043a929ee5416e36eda5.tar.lz nixpkgs-04000331c10f4fffdb24043a929ee5416e36eda5.tar.xz nixpkgs-04000331c10f4fffdb24043a929ee5416e36eda5.tar.zst nixpkgs-04000331c10f4fffdb24043a929ee5416e36eda5.zip | |
Merge pull request #74284 from matthewbauer/ios-with-xcode-11
Update iOS for XCode 11
Diffstat (limited to 'pkgs/development/compilers/ghc')
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.4.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.5.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.8.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.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index f79200d1199..075947a02a4 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -7,7 +7,7 @@ , libiconv ? null, ncurses -, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) +, useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) || stdenv.targetPlatform.isiOS , # 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.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index 0b565d3705d..b31b3db7eb2 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -10,7 +10,7 @@ , # GHC can be built with system libffi or a bundled one. libffi ? null -, useLLVM ? !stdenv.targetPlatform.isx86 +, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS , # 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.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index 9197b80224e..2b859de9799 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -10,7 +10,7 @@ , # GHC can be built with system libffi or a bundled one. libffi ? null -, useLLVM ? !stdenv.targetPlatform.isx86 +, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS , # 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 415f6c74ad5..d6ba6dd0fad 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -10,7 +10,7 @@ , enableDwarf ? !stdenv.targetPlatform.isDarwin && !stdenv.targetPlatform.isWindows, elfutils # for DWARF support -, useLLVM ? !stdenv.targetPlatform.isx86 +, useLLVM ? !stdenv.targetPlatform.isx86 || stdenv.targetPlatform.isiOS , # 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. |