Commit 66a733f2 authored by Simon Peyton Jones's avatar Simon Peyton Jones
Browse files

Merge branch 'master' of http://darcs.haskell.org/ghc

parents 35a1ec43 3c287486
......@@ -1116,7 +1116,7 @@ if test "$RELEASE" = "NO"; then
AC_MSG_RESULT(given $PACKAGE_VERSION)
elif test -d .git; then
changequote(, )dnl
ver_date=`git log -n 1 --date=short --pretty=format:%ci | sed "s/^.*\([0-9][0-9][0-9][0-9]\)-\([0-9][0-9]\)-\([0-9][0-9]\).*$/\1\2\3/"`
ver_date=`git log -n 1 --date=short --pretty=format:%ci | cut -d ' ' -f 1 | tr -d -`
if echo $ver_date | grep '^[0-9][0-9][0-9][0-9][0-9][0-9][0-9][0-9]$' 2>&1 >/dev/null; then true; else
changequote([, ])dnl
AC_MSG_ERROR([failed to detect version date: check that git is in your path])
......
......@@ -1186,11 +1186,11 @@ initLinker( void )
# endif /* RTLD_DEFAULT */
compileResult = regcomp(&re_invalid,
"(([^ \t()])+\\.so([^ \t:()])*):([ \t])*invalid ELF header",
"(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short)",
REG_EXTENDED);
ASSERT( compileResult == 0 );
compileResult = regcomp(&re_realso,
"GROUP *\\( *(([^ )])+)",
"(GROUP|INPUT) *\\( *(([^ )])+)",
REG_EXTENDED);
ASSERT( compileResult == 0 );
# endif
......@@ -1361,8 +1361,8 @@ addDLL( char *dll_name )
if (regexec(&re_realso, line, (size_t) NMATCH, match, 0) == 0) {
// success -- try to dlopen the first named file
IF_DEBUG(linker, debugBelch("match%s\n",""));
line[match[1].rm_eo] = '\0';
errmsg = internal_dlopen(line+match[1].rm_so);
line[match[2].rm_eo] = '\0';
errmsg = internal_dlopen(line+match[2].rm_so);
break;
}
// if control reaches here, no GROUP ( ... ) directive was found
......
......@@ -389,6 +389,10 @@ sub scmall {
scm ($localpath, $scm, "grep", @args)
unless $scm eq "darcs";
}
elsif ($command =~ /^clean$/) {
scm ($localpath, $scm, "clean", @args)
unless $scm eq "darcs";
}
elsif ($command =~ /^reset$/) {
scm ($localpath, $scm, "reset", @args)
unless $scm eq "darcs";
......@@ -426,6 +430,7 @@ Supported commands:
* remote rm <branch-name>
* remote set-url [--push] <branch-name>
* grep
* clean
* reset
* config
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment