diff options
| author | Matthew Bauer <mjbauer95@gmail.com> | 2019-09-17 17:55:10 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-09-17 17:55:10 -0400 |
| commit | 97a0733e28115dfaf33489fe11d363d529fb7662 (patch) | |
| tree | 4a0f8e66675f7153374e76b07faa3a5476de48c2 | |
| parent | 3736220b5bd693a47b9823388d3671f4f0b3c6e3 (diff) | |
| parent | 2021578686790d2c733eb1fa9c2034826996b176 (diff) | |
| download | nixlib-97a0733e28115dfaf33489fe11d363d529fb7662.tar nixlib-97a0733e28115dfaf33489fe11d363d529fb7662.tar.gz nixlib-97a0733e28115dfaf33489fe11d363d529fb7662.tar.bz2 nixlib-97a0733e28115dfaf33489fe11d363d529fb7662.tar.lz nixlib-97a0733e28115dfaf33489fe11d363d529fb7662.tar.xz nixlib-97a0733e28115dfaf33489fe11d363d529fb7662.tar.zst nixlib-97a0733e28115dfaf33489fe11d363d529fb7662.zip | |
Merge pull request #68701 from matthewbauer/fix-ghc-dwarf
ghc: don’t use dwarf on windows
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.4.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.4.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.5.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.8.1.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/head.nix | 3 |
6 files changed, 12 insertions, 6 deletions
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index 7c13db74c4c8..2e500db536c4 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -8,7 +8,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 30353771ea63..2fbdff865ed6 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -7,7 +7,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , useLLVM ? !stdenv.targetPlatform.isx86 || (stdenv.targetPlatform.isMusl && stdenv.hostPlatform != stdenv.targetPlatform) , # LLVM is conceptually a run-time-only depedendency, but for diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 7b6769df682a..151e80198f43 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -7,7 +7,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , # GHC can be built with system libffi or a bundled one. libffi ? null diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index acc97f93c630..0a218c29264e 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -7,7 +7,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , # GHC can be built with system libffi or a bundled one. libffi ? null diff --git a/pkgs/development/compilers/ghc/8.8.1.nix b/pkgs/development/compilers/ghc/8.8.1.nix index c80ccf72817f..3783b97795ad 100644 --- a/pkgs/development/compilers/ghc/8.8.1.nix +++ b/pkgs/development/compilers/ghc/8.8.1.nix @@ -7,7 +7,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , # GHC can be built with system libffi or a bundled one. libffi ? null diff --git a/pkgs/development/compilers/ghc/head.nix b/pkgs/development/compilers/ghc/head.nix index 240b55deb682..cbc404de862b 100644 --- a/pkgs/development/compilers/ghc/head.nix +++ b/pkgs/development/compilers/ghc/head.nix @@ -7,7 +7,8 @@ , libiconv ? null, ncurses -, enableDwarf ? !stdenv.isDarwin, elfutils # for DWARF support +, enableDwarf ? !stdenv.targetPlatform.isDarwin && + !stdenv.targetPlatform.isWindows, elfutils # for DWARF support , useLLVM ? !stdenv.targetPlatform.isx86 , # LLVM is conceptually a run-time-only depedendency, but for |