Merge pull request #4105 from chpatrick/dedup

Deduplicate library directory arguments when testing libraries

Merge pull request #4105 from chpatrick/dedup
Deduplicate library directory arguments when testing libraries
ed90fffd · John Ericson · GitHub · ad17ad99 · e88ab5fb · ed90fffd
Commit ed90fffd authored Nov 13, 2016 by John Ericson Committed by GitHub Nov 13, 2016
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 2 deletions

Cabal/Distribution/Simple/Configure.hs Cabal/Distribution/Simple/Configure.hs +4 -2

No files found.
--- a/Cabal/Distribution/Simple/Configure.hs
+++ b/Cabal/Distribution/Simple/Configure.hs
@@ -1660,8 +1660,10 @@ checkForeignDeps pkg lbi verbosity = do
        commonLdArgs  = [ "-L" ++ dir | dir <- collectField PD.extraLibDirs ]
                     ++ collectField PD.ldOptions
                     ++ [ "-L" ++ dir
-                        | dep <- deps
-                        , dir <- Installed.libraryDirs dep ]
+                        | dir <- ordNub [ dir
+                                        | dep <- deps
+                                        , dir <- Installed.libraryDirs dep ]
+                        ]
                     --TODO: do we also need dependent packages' ld options?
        makeLdArgs libs = [ "-l"++lib | lib <- libs ] ++ commonLdArgs