Skip to content
Snippets Groups Projects
Commit 4854a349 authored by Ben Gamari's avatar Ben Gamari Committed by Marge Bot
Browse files

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.
parent 32be4461
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ import Distribution.Simple.LocalBuildInfo ...@@ -14,7 +14,7 @@ import Distribution.Simple.LocalBuildInfo
import Distribution.Simple.GHC import Distribution.Simple.GHC
import Distribution.Simple.Program import Distribution.Simple.Program
import Distribution.Simple.Program.HcPkg 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, import Distribution.Simple.Utils (defaultPackageDesc, findHookedPackageDesc, writeFileAtomic,
toUTF8LBS) toUTF8LBS)
import Distribution.Simple.Build (writeAutogenFiles) import Distribution.Simple.Build (writeAutogenFiles)
...@@ -168,7 +168,7 @@ doCopy directory distDir ...@@ -168,7 +168,7 @@ doCopy directory distDir
withPrograms = progs', withPrograms = progs',
installDirTemplates = idts, installDirTemplates = idts,
configFlags = cfg, configFlags = cfg,
stripLibs = fromFlag (configStripLibs cfg), stripLibs = fromFlagOrDefault False (configStripLibs cfg),
withSharedLib = withSharedLibs withSharedLib = withSharedLibs
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment