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
d5e2d927
Commit
d5e2d927
authored
Feb 08, 2016
by
Andrey Mokhov
Browse files
Rename Rules.Config to Rules.Setup.
See
#204
.
parent
7d7802d7
Changes
3
Hide whitespace changes
Inline
Side-by-side
shaking-up-ghc.cabal
View file @
d5e2d927
...
...
@@ -42,7 +42,6 @@ executable ghc-shake
, Rules.Cabal
, Rules.Clean
, Rules.Compile
, Rules.Config
, Rules.Data
, Rules.Dependencies
, Rules.Documentation
...
...
@@ -64,6 +63,7 @@ executable ghc-shake
, Rules.Program
, Rules.Register
, Rules.Resources
, Rules.Setup
, Rules.Wrappers.Ghc
, Rules.Wrappers.GhcPkg
, Selftest
...
...
src/Main.hs
View file @
d5e2d927
...
...
@@ -8,12 +8,12 @@ import qualified Environment
import
qualified
Rules
import
qualified
Rules.Cabal
import
qualified
Rules.Clean
import
qualified
Rules.Config
import
qualified
Rules.Generate
import
qualified
Rules.Gmp
import
qualified
Rules.Libffi
import
qualified
Rules.Oracles
import
qualified
Rules.Perl
import
qualified
Rules.Setup
import
qualified
Selftest
import
qualified
Test
...
...
@@ -29,13 +29,13 @@ main = shakeArgsWith options CmdLineFlag.cmdFlags $ \cmdLineFlags targets -> do
rules
=
mconcat
[
Rules
.
Cabal
.
cabalRules
,
Rules
.
Clean
.
cleanRules
,
Rules
.
Config
.
configRules
,
Rules
.
Generate
.
generateRules
,
Rules
.
Generate
.
copyRules
,
Rules
.
Gmp
.
gmpRules
,
Rules
.
Libffi
.
libffiRules
,
Rules
.
Oracles
.
oracleRules
,
Rules
.
Perl
.
perlScriptRules
,
Rules
.
Setup
.
setupRules
,
Rules
.
topLevelTargets
,
Rules
.
packageRules
,
Selftest
.
selftestRules
...
...
src/Rules/
Config
.hs
→
src/Rules/
Setup
.hs
View file @
d5e2d927
module
Rules.
Config
(
config
Rules
)
where
module
Rules.
Setup
(
setup
Rules
)
where
import
qualified
System.Info
...
...
@@ -7,8 +7,8 @@ import CmdLineFlag
import
Rules.Actions
import
Rules.Generators.GhcAutoconfH
config
Rules
::
Rules
()
config
Rules
=
do
setup
Rules
::
Rules
()
setup
Rules
=
do
-- We always rerun the configure script in this mode, because the flags
-- passed to it can affect the contents of system.config file.
[
configFile
,
"settings"
,
configH
]
&%>
\
[
cfg
,
settings
,
cfgH
]
->
do
...
...
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