[commit: ghc] wip/nfs-locking: Unify include and link paths (13b80f7)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/13b80f771aac9e9d4a5363632c474261914d5e18/ghc

>---------------------------------------------------------------

commit 13b80f771aac9e9d4a5363632c474261914d5e18
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Thu May 19 00:45:14 2016 +0100

    Unify include and link paths


>---------------------------------------------------------------

13b80f771aac9e9d4a5363632c474261914d5e18
 src/Settings/Builders/Common.hs | 2 +-
 src/Settings/Builders/Ghc.hs    | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Settings/Builders/Common.hs b/src/Settings/Builders/Common.hs
index 3f53dec..252667f 100644
--- a/src/Settings/Builders/Common.hs
+++ b/src/Settings/Builders/Common.hs
@@ -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
diff --git a/src/Settings/Builders/Ghc.hs b/src/Settings/Builders/Ghc.hs
index 66c009b..2199874 100644
--- a/src/Settings/Builders/Ghc.hs
+++ b/src/Settings/Builders/Ghc.hs
@@ -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 ()