[commit: ghc] wip/nfs-locking: Fix include paths. (1d18a74)

[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/1d18a749606d4c093b00e8f4823b89597dae4c9a/ghc

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

commit 1d18a749606d4c093b00e8f4823b89597dae4c9a
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Sun Jan 10 12:11:11 2016 +0000

    Fix include paths.
    
    See #145.


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

1d18a749606d4c093b00e8f4823b89597dae4c9a
 src/Settings/Builders/HsCpp.hs      | 4 +++-
 src/Settings/Packages/Ghc.hs        | 4 ++--
 src/Settings/Packages/IntegerGmp.hs | 1 +
 src/Settings/Packages/IservBin.hs   | 3 +--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/Settings/Builders/HsCpp.hs b/src/Settings/Builders/HsCpp.hs
index 89980ee..43b9455 100644
--- a/src/Settings/Builders/HsCpp.hs
+++ b/src/Settings/Builders/HsCpp.hs
@@ -1,9 +1,11 @@
 module Settings.Builders.HsCpp (hsCppBuilderArgs) where
 
 import Expression
+import GHC
 import Oracles
 import Predicates (builder)
 import Settings.Builders.GhcCabal
+import Settings.TargetDirectory
 
 hsCppBuilderArgs :: Args
 hsCppBuilderArgs = builder HsCpp ? do
@@ -11,7 +13,7 @@ hsCppBuilderArgs = builder HsCpp ? do
     mconcat [ append =<< getSettingList HsCppArgs
             , arg "-P"
             , cppArgs
-            , arg $ "-Icompiler/" ++ stageString stage
+            , arg $ "-I" ++ targetPath stage compiler
             , arg "-x"
             , arg "c"
             , arg =<< getInput ]
diff --git a/src/Settings/Packages/Ghc.hs b/src/Settings/Packages/Ghc.hs
index efc059d..0830cb6 100644
--- a/src/Settings/Packages/Ghc.hs
+++ b/src/Settings/Packages/Ghc.hs
@@ -1,16 +1,16 @@
 module Settings.Packages.Ghc (ghcPackageArgs) where
 
-import Base
 import Expression
 import GHC (ghc, compiler)
 import Oracles.Config.Setting
 import Predicates (builder, builderGhc, package, notStage0)
+import Settings.TargetDirectory
 
 ghcPackageArgs :: Args
 ghcPackageArgs = package ghc ? do
     stage <- getStage
     mconcat [ builderGhc ? mconcat
-              [ arg ("-I" ++ pkgPath compiler -/- stageString stage)
+              [ arg $ "-I" ++ targetPath stage compiler
               , arg "-no-hs-main" ]
 
             , builder GhcCabal ?
diff --git a/src/Settings/Packages/IntegerGmp.hs b/src/Settings/Packages/IntegerGmp.hs
index 6d1b2b6..c679bf3 100644
--- a/src/Settings/Packages/IntegerGmp.hs
+++ b/src/Settings/Packages/IntegerGmp.hs
@@ -5,6 +5,7 @@ import Expression
 import GHC (integerGmp)
 import Predicates (builder, builderGcc, package)
 
+-- TODO: move build artefacts to buildRootPath, see #113
 -- TODO: Is this needed?
 -- ifeq "$(GMP_PREFER_FRAMEWORK)" "YES"
 -- libraries/integer-gmp_CONFIGURE_OPTS += --with-gmp-framework-preferred
diff --git a/src/Settings/Packages/IservBin.hs b/src/Settings/Packages/IservBin.hs
index 5ad3bd5..a662d1c 100644
--- a/src/Settings/Packages/IservBin.hs
+++ b/src/Settings/Packages/IservBin.hs
@@ -6,5 +6,4 @@ import Predicates (builderGhc, package)
 
 iservBinPackageArgs :: Args
 iservBinPackageArgs = package iservBin ? do
-    mconcat [ builderGhc ?
-              mconcat [ arg "-no-hs-main" ]]
+    mconcat [ builderGhc ? arg "-no-hs-main" ]