Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Alex D
GHC
Commits
26b6eac2
Commit
26b6eac2
authored
Oct 14, 2010
by
Ian Lynagh
Browse files
Have boot check that we have the dph packages when validating
parent
0a435635
Changes
2
Hide whitespace changes
Inline
Side-by-side
boot
View file @
26b6eac2
...
...
@@ -4,6 +4,21 @@ use strict;
use
Cwd
;
my
%required_tag
;
$required_tag
{"
-
"}
=
1
;
while
(
$#ARGV
ne
-
1
)
{
my
$arg
=
shift
@ARGV
;
if
(
$arg
=~
/^--required-tag=(.*)/
)
{
$required_tag
{
$
1
}
=
1
;
}
else
{
die
"
Bad arg:
$arg
";
}
}
# Create libraries/*/{ghc.mk,GNUmakefile}
system
("
/usr/bin/perl
",
"
-w
",
"
boot-pkgs
")
==
0
or
die
"
Running boot-pkgs failed: $?
";
...
...
@@ -27,7 +42,7 @@ while (<PACKAGES>) {
# If $tag is not "-" then it is an optional repository, so its
# absence isn't an error.
if
(
$tag
eq
"
-
"
)
{
if
(
defined
(
$required_tag
{
$tag
})
)
{
# We would like to just check for an _darcs directory here,
# but in an lndir tree we avoid making _darcs directories,
# so it doesn't exist. We therefore require that every repo
...
...
validate
View file @
26b6eac2
...
...
@@ -73,7 +73,7 @@ if [ $no_clean -eq 0 ]; then
INSTDIR
=
`
cygpath
-m
"
$INSTDIR
"
`
fi
/usr/bin/perl
-w
boot
/usr/bin/perl
-w
boot
--required-tag
=
dph
./configure
--prefix
=
"
$INSTDIR
"
$config_args
fi
...
...
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