diff options
| author | Gleb Popov <6yearold@gmail.com> | 2017-08-14 20:54:36 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2017-08-14 21:32:16 -0400 |
| commit | 0a891c8c448a0e70abb075702857d743674ad1ad (patch) | |
| tree | 7c1becfe4bb2b287a25bcda134e66faea9be27e4 /rts/Linker.c | |
| parent | ad7b945257ea262e3f6f46daa4ff3e451aeeae0b (diff) | |
| download | haskell-0a891c8c448a0e70abb075702857d743674ad1ad.tar.gz | |
Properly handle dlerror() message on FreeBSD when linking linker scripts
Test Plan: `GHCi.loadDll "/usr/lib/libc++.so` now works on FreeBSD.
Reviewers: austin, bgamari, erikd, simonmar
Reviewed By: simonmar
Subscribers: rwbarton, thomie
Differential Revision: https://phabricator.haskell.org/D3841
Diffstat (limited to 'rts/Linker.c')
| -rw-r--r-- | rts/Linker.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rts/Linker.c b/rts/Linker.c index 37007264db..18f2c6b958 100644 --- a/rts/Linker.c +++ b/rts/Linker.c @@ -482,7 +482,7 @@ initLinker_ (int retain_cafs) # endif /* RTLD_DEFAULT */ compileResult = regcomp(&re_invalid, - "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short)", + "(([^ \t()])+\\.so([^ \t:()])*):([ \t])*(invalid ELF header|file too short|invalid file format)", REG_EXTENDED); if (compileResult != 0) { barf("Compiling re_invalid failed"); |