Commit 734994cf authored by Andrey Mokhov's avatar Andrey Mokhov
Browse files

Rename includeHcArgs to includeGhcArgs.

parent debca7ad
......@@ -7,7 +7,7 @@ module Package.Base (
Package (..), Settings (..), TodoItem (..),
defaultSettings, libraryPackage,
commonCcArgs, commonLdArgs, commonCppArgs, commonCcWarninigArgs,
pathArgs, packageArgs, includeHcArgs, pkgHsSources,
pathArgs, packageArgs, includeGhcArgs, pkgHsSources,
pkgDepHsObjects, pkgLibHsObjects, pkgCObjects,
argSizeLimit,
sourceDependecies,
......@@ -92,8 +92,8 @@ packageArgs stage pathDist = do
else productArgs "-package-name" (arg $ PackageKey pathDist)
<> productArgs "-package" (args $ Deps pathDist) ]
includeHcArgs :: FilePath -> FilePath -> Args
includeHcArgs path dist =
includeGhcArgs :: FilePath -> FilePath -> Args
includeGhcArgs path dist =
let pathDist = path </> dist
buildDir = toStandard $ pathDist </> "build"
in args [ arg "-i"
......
......@@ -18,7 +18,7 @@ ghcArgs (Package _ path _) (stage, dist, _) way srcs result =
, wayHcArgs way
, args SrcHcArgs
, packageArgs stage pathDist
, includeHcArgs path dist
, includeGhcArgs path dist
, concatArgs ["-optP"] $ CppArgs pathDist
, args $ HsArgs pathDist
-- TODO: now we have both -O and -O2
......
......@@ -13,7 +13,7 @@ ghcArgs (Package name path _) (stage, dist, settings) =
depFile = buildDir </> "haskell.deps"
in args [ arg "-M"
, packageArgs stage pathDist
, includeHcArgs path dist
, includeGhcArgs path dist
, concatArgs ["-optP"] $ CppArgs pathDist
, productArgs ["-odir", "-stubdir", "-hidir"] buildDir
, args ["-dep-makefile", depFile <.> "new"]
......@@ -21,10 +21,6 @@ ghcArgs (Package name path _) (stage, dist, settings) =
, args $ HsArgs pathDist
, args $ pkgHsSources path dist ]
-- $(CPP) $($1_$2_MKDEPENDC_OPTS)
-- $($1_$2_$(firstword $($1_$2_WAYS))_ALL_CC_OPTS)
-- $($(basename $4)_CC_OPTS) -MM -x c $4 -MF $3.bit
--
-- $1_$2_$3_ALL_CC_OPTS = \
-- $$(WAY_$3_CC_OPTS) \
-- $$($1_$2_DIST_GCC_CC_OPTS) \
......
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