Commit 56cf235d authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Rename appendCcArgs to ccArgs.

parent 2f373e4a
......@@ -4,7 +4,7 @@ module Settings.Util (
-- Primitive settings elements
arg, argM, args,
argConfig, argStagedConfig, argConfigList, argStagedConfigList,
appendCcArgs,
ccArgs,
-- argBuilderPath, argStagedBuilderPath,
-- argPackageKey, argPackageDeps, argPackageDepKeys, argSrcDirs,
-- argIncludeDirs, argDepIncludeDirs,
......@@ -48,8 +48,8 @@ argStagedConfigList key = do
argConfigList (stagedKey stage key)
-- Pass arguments to Gcc and corresponding lists of sub-arguments of GhcCabal
appendCcArgs :: [String] -> Settings
appendCcArgs args = do
ccArgs :: [String] -> Settings
ccArgs args = do
stage <- asks getStage
mconcat [ builder (Gcc stage) ? append args
, builder GhcCabal ? appendSub "--configure-option=CFLAGS" args
......
......@@ -88,7 +88,7 @@ customPackageSettings = mconcat
[ package integerLibrary ?
mconcat [ windowsHost ? builder GhcCabal ?
arg "--configure-option=--with-intree-gmp"
, appendCcArgs ["-Ilibraries/integer-gmp2/gmp"] ]
, ccArgs ["-Ilibraries/integer-gmp2/gmp"] ]
, package base ?
builder GhcCabal ? arg ("--flags=" ++ integerLibraryName)
......
......@@ -38,7 +38,7 @@ userSettings' = mconcat
[ package base ?
builder GhcCabal ? arg ("--flags=" ++ integerLibraryName)
, package integerLibrary ? appendCcArgs ["-Ilibraries/integer-gmp2/gmp"]
, package integerLibrary ? ccArgs ["-Ilibraries/integer-gmp2/gmp"]
, windowsHost ?
package integerLibrary ?
......
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