Commit 13b80f77 authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Unify include and link paths

parent dd3d5923
......@@ -25,7 +25,7 @@ cIncludeArgs = do
mconcat [ arg $ "-I" ++ path
, arg $ "-I" ++ path -/- "autogen"
, append [ "-I" ++ pkgPath pkg -/- dir | dir <- incDirs ]
, append [ "-I" ++ dir | dir <- depDirs ] ]
, append [ "-I" ++ unifyPath dir | dir <- depDirs ] ]
ldArgs :: Args
ldArgs = mempty
......
......@@ -44,8 +44,8 @@ ghcLinkArgs = builder (Ghc Link) ? do
else return []
libDirs <- getPkgDataList DepLibDirs
mconcat [ arg "-no-auto-link-packages"
, append [ "-optl-l" ++ lib | lib <- libs ++ gmpLibs ]
, append [ "-optl-L" ++ dir | dir <- libDirs ] ]
, append [ "-optl-l" ++ lib | lib <- libs ++ gmpLibs ]
, append [ "-optl-L" ++ unifyPath dir | dir <- libDirs ] ]
-- TODO: Add Touchy builder and use needBuilder.
needTouchy :: ReaderT Target Action ()
......
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