diff options
| author |   Repository QA checks <repo-qa-checks@gentoo.org> | 2016-09-02 09:52:36 +0000 |
|---|---|---|
| committer | Repository QA checks <repo-qa-checks@gentoo.org> | 2016-09-02 09:52:36 +0000 |
| commit | b6aceb1b257a4d7e4736619d3f861486d5f8c22f (patch) | |
| tree | 3b256d9849df0e5e55dcaa5fe67a4401e653628e | |
| parent | 2016-09-02 09:29:22 UTC (diff) | |
| parent | haskell-cabal.eclass: unleash full parallelism of parallel ghc (diff) | |
| download | gentoo-b6aceb1b257a4d7e4736619d3f861486d5f8c22f.tar.gz gentoo-b6aceb1b257a4d7e4736619d3f861486d5f8c22f.tar.bz2 gentoo-b6aceb1b257a4d7e4736619d3f861486d5f8c22f.zip | |
Merge updates from master
| -rw-r--r-- | eclass/haskell-cabal.eclass | 20 |
1 files changed, 8 insertions, 12 deletions
diff --git a/eclass/haskell-cabal.eclass b/eclass/haskell-cabal.eclass index c1a13300abb0..94ef7f35ad75 100644 --- a/eclass/haskell-cabal.eclass +++ b/eclass/haskell-cabal.eclass @@ -372,24 +372,20 @@ cabal-configure() { cabalconf+=($(cabal-constraint "ghc")) fi + # parallel on all available cores + if ghc-supports-parallel-make; then + # It should have been just -j$(makeopts_jobs) + # but GHC does not yet have nice defaults: + # https://ghc.haskell.org/trac/ghc/ticket/9221#comment:57 + cabalconf+=(--ghc-options="-j$(makeopts_jobs) +RTS -A256M -qb0 -RTS") + fi + local option for option in ${HCFLAGS} do cabalconf+=(--ghc-option="$option") done - # parallel on all available cores - if ghc-supports-parallel-make; then - local max_jobs=$(makeopts_jobs) - - # limit to very small value, as parallelism - # helps slightly, but makes things severely worse - # when amount of threads is Very Large. - [[ ${max_jobs} -gt 4 ]] && max_jobs=4 - - cabalconf+=(--ghc-option=-j"$max_jobs") - fi - # Building GHCi libs on ppc64 causes "TOC overflow". if use ppc64; then cabalconf+=(--disable-library-for-ghci) |