From 4854a3490518760405f04826df1768b5a7b96da2 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Fri, 19 Jul 2019 21:33:55 -0400
Subject: [PATCH] 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.
---
utils/ghc-cabal/Main.hs | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/utils/ghc-cabal/Main.hs b/utils/ghc-cabal/Main.hs
index 7f2cf91bb8df..5827331c9cbc 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
}
--
GitLab