Commit 5345fcfe authored by Mikhail Glushenkov's avatar Mikhail Glushenkov Committed by GitHub
Browse files

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

Dedupe include dirs inherited from dependencies
parents 366f5a8d 6e31b30d
...@@ -1603,8 +1603,12 @@ checkForeignDeps pkg lbi verbosity = do ...@@ -1603,8 +1603,12 @@ checkForeignDeps pkg lbi verbosity = do
++ collectField PD.cppOptions ++ collectField PD.cppOptions
++ collectField PD.ccOptions ++ collectField PD.ccOptions
++ [ "-I" ++ dir ++ [ "-I" ++ dir
| dep <- deps | dir <- ordNub [ dir
, dir <- Installed.includeDirs dep ] | dep <- deps
, dir <- Installed.includeDirs dep ]
-- dedupe include dirs of dependencies
-- to prevent quadratic blow-up
]
++ [ opt ++ [ opt
| dep <- deps | dep <- deps
, opt <- Installed.ccOptions dep ] , opt <- Installed.ccOptions dep ]
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment