Commit a8c51c33 authored by CJ van den Berg's avatar CJ van den Berg Committed by Ian Lynagh

This is required to successfully load terminfo into GHCi in current

versions of Fedora. The INPUT command is use by libncursesw.so in
Fedora.
parent 877816b9
......@@ -1190,7 +1190,7 @@ initLinker( void )
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
......
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