diff options
author | Ben Gamari <ben@smart-cactus.org> | 2019-07-19 21:33:55 -0400 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2019-07-19 21:35:59 -0400 |
commit | 420fcc1d0fc0f5b0a01715c3d5671a1e23dfdd05 (patch) | |
tree | b72b5e48a38d25694664d503f324b8d8095dba0a /utils/ghc-cabal/Main.hs | |
parent | 82abc479ab33183a5572ddc8cb3c4dbea8f06a0d (diff) | |
download | haskell-wip/fix-ghc-cabal.tar.gz |
ghc-cabal: Use fromFlagOrDefault instead of fromFlagwip/fix-ghc-cabal
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.
Diffstat (limited to 'utils/ghc-cabal/Main.hs')
-rw-r--r-- | utils/ghc-cabal/Main.hs | 4 |
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 } |