Commit dc8dbcc5 authored by kgardas's avatar kgardas
Browse files

do not pass --with-intree-gmp to configure when system gmp is used

parent 875d9ca4
......@@ -4,7 +4,9 @@ import Base
import Expression
import GHC (integerGmp)
import Predicates (builder, builderGcc, package)
import Settings.Builders.Common
import Settings.Paths
import Oracles.Config.Setting
-- TODO: move build artefacts to buildRootPath, see #113
-- TODO: Is this needed?
......@@ -14,11 +16,17 @@ import Settings.Paths
integerGmpPackageArgs :: Args
integerGmpPackageArgs = package integerGmp ? do
let includeGmp = "-I" ++ gmpBuildPath -/- "include"
gmp_includedir <- getSetting GmpIncludeDir
gmp_libdir <- getSetting GmpLibDir
let gmp_args = if (gmp_includedir == "" && gmp_libdir == "")
then
[ arg "--configure-option=--with-intree-gmp" ]
else
[]
mconcat [ builder GhcCabal ? mconcat
[ arg "--configure-option=--with-intree-gmp"
, appendSub "--configure-option=CFLAGS" [includeGmp]
, appendSub "--gcc-options" [includeGmp] ]
(gmp_args ++
[ 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