[commit: ghc] wip/nfs-locking: Adds integer gmp path to the Gcc builder. (8cea200)

[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/8cea2007b3449adb88c35cbdbeaf2407b658c4ae/ghc

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

commit 8cea2007b3449adb88c35cbdbeaf2407b658c4ae
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Sun Jan 3 20:56:24 2016 +0800

    Adds integer gmp path to the Gcc builder.
    
    This fixes the isse mentioned in #79, where `gmp.h` could not be found.


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

8cea2007b3449adb88c35cbdbeaf2407b658c4ae
 src/Settings/Packages/IntegerGmp.hs | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/Settings/Packages/IntegerGmp.hs b/src/Settings/Packages/IntegerGmp.hs
index 1c8ed13..6d1b2b6 100644
--- a/src/Settings/Packages/IntegerGmp.hs
+++ b/src/Settings/Packages/IntegerGmp.hs
@@ -3,7 +3,7 @@ module Settings.Packages.IntegerGmp (integerGmpPackageArgs) where
 import Base
 import Expression
 import GHC (integerGmp)
-import Predicates (builder, package)
+import Predicates (builder, builderGcc, package)
 
 -- TODO: Is this needed?
 -- ifeq "$(GMP_PREFER_FRAMEWORK)" "YES"
@@ -11,9 +11,12 @@ import Predicates (builder, package)
 -- endif
 integerGmpPackageArgs :: Args
 integerGmpPackageArgs = package integerGmp ?
-    builder GhcCabal ? mconcat
-        [ arg "--configure-option=--with-intree-gmp"
-        , appendSub "--configure-option=CFLAGS" includeGmp
-        , appendSub "--gcc-options"             includeGmp ]
+    mconcat
+        [ builder GhcCabal ? mconcat
+            [ arg "--configure-option=--with-intree-gmp"
+            , appendSub "--configure-option=CFLAGS" includeGmp
+            , appendSub "--gcc-options"             includeGmp ]
+        , builderGcc ? ( arg $ "-I" ++ pkgPath integerGmp -/- "gmp" )
+        ]
   where
     includeGmp = ["-I" ++ pkgPath integerGmp -/- "gmp"]