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
efb59728
Commit
efb59728
authored
Jan 13, 2015
by
Andrey Mokhov
Browse files
Use terseRun and new configuration options.
parent
30138cb1
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/Package/Compile.hs
View file @
efb59728
...
...
@@ -43,7 +43,7 @@ buildPackageCompile (Package name path _) (stage, dist, settings) =
let
deps
=
concat
$
snd
$
unzip
$
filter
((
==
out
)
.
fst
)
depContents
srcs
=
filter
(
"//*hs"
?==
)
deps
-- TODO: handle *.c sources
need
deps
r
un
(
Ghc
stage
)
$
suffixArgs
way
terseR
un
(
Ghc
stage
)
$
suffixArgs
way
<>
wayHcArgs
way
<>
arg
SrcHcOpts
<>
packageArgs
stage
pkgData
...
...
@@ -51,6 +51,6 @@ buildPackageCompile (Package name path _) (stage, dist, settings) =
-- TODO: now we have both -O and -O2
<>
arg
[
"-Wall"
,
"-XHaskell2010"
,
"-O2"
]
<>
productArgs
[
"-odir"
,
"-hidir"
,
"-stubdir"
]
buildDir
<>
arg
"-split-objs"
<>
when
(
splitObjects
stage
)
(
arg
"-split-objs"
)
<>
arg
(
"-c"
:
srcs
)
<>
arg
[
"-o"
,
out
]
src/Package/Data.hs
View file @
efb59728
...
...
@@ -93,6 +93,6 @@ buildPackageData (Package name path _) (stage, dist, settings) =
need
[
"shake/src/Package/Data.hs"
]
need
[
path
</>
name
<.>
"cabal"
]
when
(
doesFileExist
$
configure
<.>
"ac"
)
$
need
[
configure
]
r
un
GhcCabal
cabalArgs
when
(
registerPackage
settings
)
$
r
un
(
GhcPkg
stage
)
ghcPkgArgs
terseR
un
GhcCabal
cabalArgs
when
(
registerPackage
settings
)
$
terseR
un
(
GhcPkg
stage
)
ghcPkgArgs
postProcessPackageData
$
pathDist
</>
"package-data.mk"
src/Package/Dependencies.hs
View file @
efb59728
...
...
@@ -10,13 +10,13 @@ buildPackageDependencies (Package name path _) (stage, dist, settings) =
in
(
buildDir
</>
name
<.>
"m"
)
%>
\
out
->
do
need
[
"shake/src/Package/Dependencies.hs"
]
r
un
(
Ghc
stage
)
$
arg
"-M"
terseR
un
(
Ghc
stage
)
$
arg
"-M"
<>
packageArgs
stage
pkgData
<>
includeArgs
path
dist
<>
productArgs
[
"-odir"
,
"-stubdir"
]
buildDir
<>
arg
[
"-dep-makefile"
,
out
]
<>
productArgs
"-dep-suffix"
(
map
suf
fix
<$>
ways
settings
)
<>
srcArgs
path
pkgData
<>
productArgs
"-dep-suffix"
(
map
wayPre
fix
<$>
ways
settings
)
<>
arg
(
pkgHsSources
path
dist
)
-- TODO: Check that skipping all _HC_OPTS is safe.
-- <> arg SrcHcOpts
-- TODO: i) is this needed? ii) shall we run GHC -M multiple times?
...
...
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