[commit: packages/Cabal] ghc-head: finalizePackageDescription: don't reverse the order of components. (90e4cf4)
git at git.haskell.org
git at git.haskell.org
Mon Aug 26 23:30:13 CEST 2013
Repository : ssh://git@git.haskell.org/Cabal
On branch : ghc-head
Link : http://git.haskell.org/?p=packages/Cabal.git;a=commit;h=90e4cf4bb82868f120e44a4c3d9363c372edeeb4
>---------------------------------------------------------------
commit 90e4cf4bb82868f120e44a4c3d9363c372edeeb4
Author: Mikhail Glushenkov <mikhail.glushenkov at gmail.com>
Date: Tue Aug 20 04:37:37 2013 +0200
finalizePackageDescription: don't reverse the order of components.
Fixes #1424.
>---------------------------------------------------------------
90e4cf4bb82868f120e44a4c3d9363c372edeeb4
Cabal/Distribution/PackageDescription/Configuration.hs | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/Cabal/Distribution/PackageDescription/Configuration.hs b/Cabal/Distribution/PackageDescription/Configuration.hs
index 9dec178..f8d8107 100644
--- a/Cabal/Distribution/PackageDescription/Configuration.hs
+++ b/Cabal/Distribution/PackageDescription/Configuration.hs
@@ -410,7 +410,7 @@ flattenTaggedTargets (TargetSet targets) = foldr untag (Nothing, [], [], []) tar
userBug $ "There exists a test with the same name as an exe: '" ++ n ++ "'"
| any ((== n) . fst) bms =
userBug $ "There exists a benchmark with the same name as an exe: '" ++ n ++ "'"
- | otherwise = (mlib, exes ++ [(n, e')], tests, bms)
+ | otherwise = (mlib, (n, e'):exes, tests, bms)
where
e' = e {
buildInfo = (buildInfo e) { targetBuildDepends = fromDepMap deps }
@@ -422,7 +422,7 @@ flattenTaggedTargets (TargetSet targets) = foldr untag (Nothing, [], [], []) tar
userBug $ "There exists an exe with the same name as the test: '" ++ n ++ "'"
| any ((== n) . fst) bms =
userBug $ "There exists a benchmark with the same name as the test: '" ++ n ++ "'"
- | otherwise = (mlib, exes, tests ++ [(n, t')], bms)
+ | otherwise = (mlib, exes, (n, t'):tests, bms)
where
t' = t {
testBuildInfo = (testBuildInfo t)
@@ -435,7 +435,7 @@ flattenTaggedTargets (TargetSet targets) = foldr untag (Nothing, [], [], []) tar
userBug $ "There exists an exe with the same name as the benchmark: '" ++ n ++ "'"
| any ((== n) . fst) tests =
userBug $ "There exists a test with the same name as the benchmark: '" ++ n ++ "'"
- | otherwise = (mlib, exes, tests, bms ++ [(n, b')])
+ | otherwise = (mlib, exes, tests, (n, b'):bms)
where
b' = b {
benchmarkBuildInfo = (benchmarkBuildInfo b)
More information about the ghc-commits
mailing list