From a94b3f54d11dd11a755b880e1b87fae942c16c8c Mon Sep 17 00:00:00 2001
From: Gershom Bazerman <gershom@arista.com>
Date: Wed, 28 Sep 2022 22:01:03 -0400
Subject: [PATCH] ordNub for extra stanzas
---
Cabal/src/Distribution/Simple/Build.hs | 29 ++++++--------------------
1 file changed, 6 insertions(+), 23 deletions(-)
diff --git a/Cabal/src/Distribution/Simple/Build.hs b/Cabal/src/Distribution/Simple/Build.hs
index 4fe8a48c13..ad1161155d 100644
--- a/Cabal/src/Distribution/Simple/Build.hs
+++ b/Cabal/src/Distribution/Simple/Build.hs
@@ -89,7 +89,6 @@ import Distribution.Version (thisVersion)
import Distribution.Compat.Graph (IsNode(..))
import Control.Monad
-import qualified Data.Set as Set
import qualified Data.ByteString.Lazy as LBS
import System.FilePath ( (</>), (<.>), takeDirectory )
import System.Directory ( getCurrentDirectory, removeFile, doesFileExist )
@@ -434,52 +433,36 @@ generateCode codeGens nm pdesc bi lbi clbi verbosity = do
-- information.
addExtraCSources :: BuildInfo -> [FilePath] -> BuildInfo
addExtraCSources bi extras = bi { cSources = new }
- where new = Set.toList $ old `Set.union` exs
- old = Set.fromList $ cSources bi
- exs = Set.fromList extras
-
+ where new = ordNub (extras ++ cSources bi)
-- | Add extra C++ sources generated by preprocessing to build
-- information.
addExtraCxxSources :: BuildInfo -> [FilePath] -> BuildInfo
addExtraCxxSources bi extras = bi { cxxSources = new }
- where new = Set.toList $ old `Set.union` exs
- old = Set.fromList $ cxxSources bi
- exs = Set.fromList extras
-
+ where new = ordNub (extras ++ cxxSources bi)
-- | Add extra C-- sources generated by preprocessing to build
-- information.
addExtraCmmSources :: BuildInfo -> [FilePath] -> BuildInfo
addExtraCmmSources bi extras = bi { cmmSources = new }
- where new = Set.toList $ old `Set.union` exs
- old = Set.fromList $ cmmSources bi
- exs = Set.fromList extras
-
+ where new = ordNub (extras ++ cmmSources bi)
-- | Add extra ASM sources generated by preprocessing to build
-- information.
addExtraAsmSources :: BuildInfo -> [FilePath] -> BuildInfo
addExtraAsmSources bi extras = bi { asmSources = new }
- where new = Set.toList $ old `Set.union` exs
- old = Set.fromList $ asmSources bi
- exs = Set.fromList extras
+ where new = ordNub (extras ++ asmSources bi)
-- | Add extra HS modules generated by preprocessing to build
-- information.
addExtraOtherModules :: BuildInfo -> [ModuleName.ModuleName] -> BuildInfo
addExtraOtherModules bi extras = bi { otherModules = new }
- where new = Set.toList $ old `Set.union` exs
- old = Set.fromList $ otherModules bi
- exs = Set.fromList extras
+ where new = ordNub (extras ++ otherModules bi)
-- | Add extra source dir for generated modules.
addSrcDir :: BuildInfo -> FilePath -> BuildInfo
addSrcDir bi extra = bi { hsSourceDirs = new }
- where new = Set.toList $ old `Set.union` ex
- old = Set.fromList $ hsSourceDirs bi
- ex = Set.fromList [unsafeMakeSymbolicPath extra] -- TODO
-
+ where new = ordNub (unsafeMakeSymbolicPath extra : hsSourceDirs bi)
replComponent :: ReplOptions
-> Verbosity
--
GitLab