summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBen Gamari <ben@smart-cactus.org>2019-07-19 21:33:55 -0400
committerBen Gamari <ben@well-typed.com>2019-07-20 05:34:09 -0400
commit89ebcd97d50ae95145a6e3558d392ab2678797fe (patch)
tree09a033a9c8ab00ac1ca7790836d96e2b3fb2bfed
parent19de40e3d29b92c18106454f23f91a2f0c126b10 (diff)
downloadhaskell-89ebcd97d50ae95145a6e3558d392ab2678797fe.tar.gz
ghc-cabal: Use fromFlagOrDefault instead of fromFlag
As fromFlag is partial. The only case where we used fromFlag is when determining whether to strip libraries; we now assume that we shouldn't.
-rw-r--r--utils/ghc-cabal/Main.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 7f2cf91bb8..5827331c9c 100644
--- a/utils/ghc-cabal/Main.hs
+++ b/utils/ghc-cabal/Main.hs
@@ -14,7 +14,7 @@ import Distribution.Simple.LocalBuildInfo
import Distribution.Simple.GHC
import Distribution.Simple.Program
import Distribution.Simple.Program.HcPkg
-import Distribution.Simple.Setup (ConfigFlags(configStripLibs), fromFlag, toFlag)
+import Distribution.Simple.Setup (ConfigFlags(configStripLibs), fromFlagOrDefault, toFlag)
import Distribution.Simple.Utils (defaultPackageDesc, findHookedPackageDesc, writeFileAtomic,
toUTF8LBS)
import Distribution.Simple.Build (writeAutogenFiles)
@@ -168,7 +168,7 @@ doCopy directory distDir
withPrograms = progs',
installDirTemplates = idts,
configFlags = cfg,
- stripLibs = fromFlag (configStripLibs cfg),
+ stripLibs = fromFlagOrDefault False (configStripLibs cfg),
withSharedLib = withSharedLibs
}