Merge pull request #4554 from shlevy/no-parallel-haskell
Revert "cabal: enable multi-threaded builds with GHC 7.8.x or later"
This commit is contained in:
commit
fe5ebe0186
|
@ -210,9 +210,6 @@ assert !enableStaticLibraries -> versionOlder "7.7" ghc.version;
|
||||||
${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) ''
|
${optionalString (self.enableSharedExecutables && self.stdenv.isDarwin) ''
|
||||||
configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names"
|
configureFlags+=" --ghc-option=-optl=-Wl,-headerpad_max_install_names"
|
||||||
''}
|
''}
|
||||||
${optionalString (versionOlder "7.8" ghc.version) ''
|
|
||||||
configureFlags+=" --ghc-option=-j$NIX_BUILD_CORES"
|
|
||||||
''}
|
|
||||||
|
|
||||||
echo "configure flags: $extraConfigureFlags $configureFlags"
|
echo "configure flags: $extraConfigureFlags $configureFlags"
|
||||||
./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \
|
./Setup configure --verbose --prefix="$out" --libdir='$prefix/lib/$compiler' \
|
||||||
|
|
Loading…
Reference in New Issue