diff options
| author | Peter Simons <simons@cryp.to> | 2018-01-08 11:50:41 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-08 11:50:41 +0100 |
| commit | 48a6d1a2ab3309081ccbf933ccf071068a5c2c48 (patch) | |
| tree | b61f002eadd994beda47c7fdfec613f8afdb87fd /pkgs/development/haskell-modules | |
| parent | 424aa1a6814017eaa4dcafc97a42af6a476582c8 (diff) | |
| parent | 05824e66a1425c07c0249846756b1109b9953927 (diff) | |
| download | nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar.gz nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar.bz2 nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar.lz nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar.xz nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.tar.zst nixlib-48a6d1a2ab3309081ccbf933ccf071068a5c2c48.zip | |
Merge pull request #33405 from dhess/ghc-armv7l
Make GHC work on armv7l-linux
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/configuration-common.nix | 2 | ||||
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/configuration-common.nix b/pkgs/development/haskell-modules/configuration-common.nix index 3a1e733a63da..b67666ab6e02 100644 --- a/pkgs/development/haskell-modules/configuration-common.nix +++ b/pkgs/development/haskell-modules/configuration-common.nix @@ -1029,4 +1029,6 @@ self: super: { # https://github.com/Twinside/Juicy.Pixels/issues/149 JuicyPixels = dontHaddock super.JuicyPixels; + # armv7l fixes. + happy = if pkgs.stdenv.isArm then dontCheck super.happy else super.happy; # Similar to https://ghc.haskell.org/trac/ghc/ticket/13062 } diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index 29bcdfce2c93..bf195696f947 100644 --- a/pkgs/development/haskell-modules/generic-builder.nix +++ b/pkgs/development/haskell-modules/generic-builder.nix @@ -130,7 +130,7 @@ let (optionalString (enableSharedExecutables && stdenv.isDarwin) "--ghc-option=-optl=-Wl,-headerpad_max_install_names") (optionalString enableParallelBuilding "--ghc-option=-j$NIX_BUILD_CORES") (optionalString useCpphs "--with-cpphs=${cpphs}/bin/cpphs --ghc-options=-cpp --ghc-options=-pgmP${cpphs}/bin/cpphs --ghc-options=-optP--cpp") - (enableFeature (enableDeadCodeElimination && (versionAtLeast "8.0.1" ghc.version)) "split-objs") + (enableFeature (enableDeadCodeElimination && !stdenv.isArm && !stdenv.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") (enableFeature enableLibraryProfiling "library-profiling") (enableFeature enableExecutableProfiling (if versionOlder ghc.version "8" then "executable-profiling" else "profiling")) (enableFeature enableSharedLibraries "shared") |