Commit 30883f8d authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Merge pull request #185 from kgardas/fix_gmp_cabal_args

do not pass --with-intree-gmp to configure when system gmp is used
parents 11f78b18 06fb099d
......@@ -5,6 +5,7 @@ import Expression
import GHC (integerGmp)
import Predicates (builder, builderGcc, package)
import Settings.Paths
import Oracles.Config.Setting
-- TODO: move build artefacts to buildRootPath, see #113
-- TODO: Is this needed?
......@@ -14,11 +15,13 @@ import Settings.Paths
integerGmpPackageArgs :: Args
integerGmpPackageArgs = package integerGmp ? do
let includeGmp = "-I" ++ gmpBuildPath -/- "include"
gmpIncludeDir <- getSetting GmpIncludeDir
gmpLibDir <- getSetting GmpLibDir
mconcat [ builder GhcCabal ? mconcat
[ arg "--configure-option=--with-intree-gmp"
[ (null gmpIncludeDir && null gmpLibDir) ?
arg "--configure-option=--with-intree-gmp"
, appendSub "--configure-option=CFLAGS" [includeGmp]
, appendSub "--gcc-options" [includeGmp] ]
, builderGcc ? arg includeGmp ]
where
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