Merge pull request #3974 from niteria/dedupe-recursive-include-dirs

Dedupe include dirs inherited from dependencies
haskell · Oct 12, 2016 · 5345fcf · 5345fcf
2 parents 366f5a8 + 6e31b30
commit 5345fcf
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/Cabal/Distribution/Simple/Configure.hs b/Cabal/Distribution/Simple/Configure.hs
@@ -1603,8 +1603,12 @@ checkForeignDeps pkg lbi verbosity = do
                      ++ collectField PD.cppOptions
                      ++ collectField PD.ccOptions
                      ++ [ "-I" ++ dir
-                        | dep <- deps
-                        , dir <- Installed.includeDirs dep ]
+                        | dir <- ordNub [ dir
+                                        | dep <- deps
+                                        , dir <- Installed.includeDirs dep ]
+                                 -- dedupe include dirs of dependencies
+                                 -- to prevent quadratic blow-up
+                        ]
                      ++ [ opt
                         | dep <- deps
                         , opt <- Installed.ccOptions dep ]