Merge remote-tracking branch 'upstream/master' into ghcjs-cross-without-cc

2019-11-25 00:23:07 +00:00
parent ea9a2c5ec2 4273a6adcc
commit 6bc456c91c
5828 changed files with 170193 additions and 135852 deletions
@@ -25,7 +25,7 @@ in
 , doBenchmark ? false
 , doHoogle ? true
 , editedCabalFile ? null
-, enableLibraryProfiling ? true
+, enableLibraryProfiling ? !(ghc.isGhcjs or false)
 , enableExecutableProfiling ? false
 , profilingDetail ? "exported-functions"
 # TODO enable shared libs for cross-compiling