Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
GHC
Commits
734994cf
Commit
734994cf
authored
Jan 17, 2015
by
Andrey Mokhov
Browse files
Rename includeHcArgs to includeGhcArgs.
parent
debca7ad
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/Package/Base.hs
View file @
734994cf
...
...
@@ -7,7 +7,7 @@ module Package.Base (
Package
(
..
),
Settings
(
..
),
TodoItem
(
..
),
defaultSettings
,
libraryPackage
,
commonCcArgs
,
commonLdArgs
,
commonCppArgs
,
commonCcWarninigArgs
,
pathArgs
,
packageArgs
,
include
H
cArgs
,
pkgHsSources
,
pathArgs
,
packageArgs
,
include
Gh
cArgs
,
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
)
]
include
H
cArgs
::
FilePath
->
FilePath
->
Args
include
H
cArgs
path
dist
=
include
Gh
cArgs
::
FilePath
->
FilePath
->
Args
include
Gh
cArgs
path
dist
=
let
pathDist
=
path
</>
dist
buildDir
=
toStandard
$
pathDist
</>
"build"
in
args
[
arg
"-i"
...
...
src/Package/Compile.hs
View file @
734994cf
...
...
@@ -18,7 +18,7 @@ ghcArgs (Package _ path _) (stage, dist, _) way srcs result =
,
wayHcArgs
way
,
args
SrcHcArgs
,
packageArgs
stage
pathDist
,
include
H
cArgs
path
dist
,
include
Gh
cArgs
path
dist
,
concatArgs
[
"-optP"
]
$
CppArgs
pathDist
,
args
$
HsArgs
pathDist
-- TODO: now we have both -O and -O2
...
...
src/Package/Dependencies.hs
View file @
734994cf
...
...
@@ -13,7 +13,7 @@ ghcArgs (Package name path _) (stage, dist, settings) =
depFile
=
buildDir
</>
"haskell.deps"
in
args
[
arg
"-M"
,
packageArgs
stage
pathDist
,
include
H
cArgs
path
dist
,
include
Gh
cArgs
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) \
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment