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
2c74f92c
Commit
2c74f92c
authored
May 21, 2016
by
Andrey Mokhov
Browse files
Fix missing dependencies for Stage2 packages
Fix
#240
.
parent
5d2c1eed
Changes
2
Hide whitespace changes
Inline
Side-by-side
src/Rules/Cabal.hs
View file @
2c74f92c
...
...
@@ -28,7 +28,7 @@ cabalRules = do
-- Cache package dependencies
packageDependencies
%>
\
out
->
do
pkgs
<-
interpretInContext
(
stageContext
Stage1
)
getPackages
let
pkgs
=
knownPackages
\\
[
hp2ps
,
libffi
,
touchy
,
unlit
]
pkgDeps
<-
forM
(
sort
pkgs
)
$
\
pkg
->
if
pkg
==
rts
then
return
$
pkgNameString
pkg
...
...
src/Rules/Data.hs
View file @
2c74f92c
...
...
@@ -31,10 +31,12 @@ buildPackageData context@Context {..} = do
whenM
(
doesFileExist
$
configure
<.>
"ac"
)
$
need
[
configure
]
-- Before we configure a package its dependencies need to be registered
let
depStage
=
min
stage
Stage1
-- dependencies come from Stage0/1
depContext
=
vanillaContext
depStage
deps
<-
packageDeps
package
pkgs
<-
interpretInContext
c
ontext
getPackages
pkgs
<-
interpretInContext
(
depC
ontext
package
)
getPackages
let
depPkgs
=
matchPackageNames
(
sort
pkgs
)
deps
need
=<<
traverse
(
pkgConfFile
.
vanilla
Context
stage
)
depPkgs
need
=<<
traverse
(
pkgConfFile
.
dep
Context
)
depPkgs
need
[
cabalFile
]
build
$
Target
context
GhcCabal
[
cabalFile
]
[
mk
]
...
...
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