diff options
| author | Drew Hess <src@drewhess.com> | 2018-01-10 22:14:01 -0800 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2018-01-11 10:45:44 -0500 |
| commit | e4f3fe051e4becd7d42201fa98619c2179908b45 (patch) | |
| tree | e763e225669d9d697ab7b82dfac3debf65d1ad24 /pkgs/development/haskell-modules | |
| parent | 888404f11bfd0c1b60904590aad56ca70e5f6d9d (diff) | |
| download | nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar.gz nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar.bz2 nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar.lz nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar.xz nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.tar.zst nixlib-e4f3fe051e4becd7d42201fa98619c2179908b45.zip | |
ghc, haskell-modules: ARM cross build fixes.
As requested in #33405.
Diffstat (limited to 'pkgs/development/haskell-modules')
| -rw-r--r-- | pkgs/development/haskell-modules/generic-builder.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/development/haskell-modules/generic-builder.nix b/pkgs/development/haskell-modules/generic-builder.nix index bf195696f947..5b2b23fc7903 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 && !stdenv.isArm && !stdenv.isAarch64 && (versionAtLeast "8.0.1" ghc.version)) "split-objs") + (enableFeature (enableDeadCodeElimination && !hostPlatform.isArm && !hostPlatform.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") |