diff options
| author | Peter Simons <simons@cryp.to> | 2019-07-06 12:54:31 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-06 12:54:31 +0200 |
| commit | 895fb1629d25d72412c270f5ce8befe383f90c84 (patch) | |
| tree | c8831762e3a2d0ff1b5e21da7d89cc8a5205ce48 | |
| parent | c1f08d7c95f0deabd5113e10830384cc762daec4 (diff) | |
| parent | b1e3d0737a1a6ddd831cf421e7d9f605f2506a2f (diff) | |
| download | nixpkgs-895fb1629d25d72412c270f5ce8befe383f90c84.tar nixpkgs-895fb1629d25d72412c270f5ce8befe383f90c84.tar.gz nixpkgs-895fb1629d25d72412c270f5ce8befe383f90c84.tar.bz2 nixpkgs-895fb1629d25d72412c270f5ce8befe383f90c84.tar.lz nixpkgs-895fb1629d25d72412c270f5ce8befe383f90c84.tar.xz nixpkgs-895fb1629d25d72412c270f5ce8befe383f90c84.tar.zst nixpkgs-895fb1629d25d72412c270f5ce8befe383f90c84.zip | |
Merge pull request #64371 from mpickering/strip-ghc
ghc: Don't strip compilers
| -rw-r--r-- | pkgs/development/compilers/ghc/8.2.2.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.4.4.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.4.nix | 4 | ||||
| -rw-r--r-- | pkgs/development/compilers/ghc/8.6.5.nix | 4 |
4 files changed, 16 insertions, 0 deletions
diff --git a/pkgs/development/compilers/ghc/8.2.2.nix b/pkgs/development/compilers/ghc/8.2.2.nix index b9099699b02..9b942da25a6 100644 --- a/pkgs/development/compilers/ghc/8.2.2.nix +++ b/pkgs/development/compilers/ghc/8.2.2.nix @@ -231,6 +231,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; doCheck = false; # fails with "testsuite/tests: No such file or directory. Stop." diff --git a/pkgs/development/compilers/ghc/8.4.4.nix b/pkgs/development/compilers/ghc/8.4.4.nix index 50f6905e5b7..a355f57a5c7 100644 --- a/pkgs/development/compilers/ghc/8.4.4.nix +++ b/pkgs/development/compilers/ghc/8.4.4.nix @@ -208,6 +208,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; diff --git a/pkgs/development/compilers/ghc/8.6.4.nix b/pkgs/development/compilers/ghc/8.6.4.nix index 5feb0a2032c..ff9ef0a5c38 100644 --- a/pkgs/development/compilers/ghc/8.6.4.nix +++ b/pkgs/development/compilers/ghc/8.6.4.nix @@ -207,6 +207,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; diff --git a/pkgs/development/compilers/ghc/8.6.5.nix b/pkgs/development/compilers/ghc/8.6.5.nix index d84f2cca059..44ad6da2ff5 100644 --- a/pkgs/development/compilers/ghc/8.6.5.nix +++ b/pkgs/development/compilers/ghc/8.6.5.nix @@ -207,6 +207,10 @@ stdenv.mkDerivation (rec { # that in turn causes GHCi to abort stripDebugFlags = [ "-S" ] ++ stdenv.lib.optional (!targetPlatform.isDarwin) "--keep-file-symbols"; + # See #63511 - the only unstripped file is the debug rts which isn't meant to + # be stripped. + dontStrip = true; + checkTarget = "test"; hardeningDisable = [ "format" ] ++ stdenv.lib.optional stdenv.targetPlatform.isMusl "pie"; |