Minor revision
[hadrian.git] / src / Settings / Packages / IntegerGmp.hs
index cc85d0f..72a70ce 100644 (file)
@@ -3,7 +3,7 @@ module Settings.Packages.IntegerGmp (integerGmpPackageArgs, gmpBuildPath) where
 import Base
 import GHC
 import Oracles.Config.Setting
-import Predicates
+import Predicate
 import Settings.Paths
 
 -- TODO: move build artefacts to buildRootPath, see #113
@@ -17,10 +17,12 @@ integerGmpPackageArgs = package integerGmp ? do
     gmpIncludeDir <- getSetting GmpIncludeDir
     gmpLibDir     <- getSetting GmpLibDir
 
-    mconcat [ builder GhcCabal ? mconcat
+    mconcat [ builder Cc ? arg includeGmp
+
+            , builder GhcCabal ? mconcat
               [ (null gmpIncludeDir && null gmpLibDir) ?
                 arg "--configure-option=--with-intree-gmp"
               , appendSub "--configure-option=CFLAGS" [includeGmp]
-              , appendSub "--gcc-options"             [includeGmp] ]
-
-            , builder Cc ? arg includeGmp ]
+              , appendSub "--gcc-options"             [includeGmp]
+              ]
+            ]