diff options
| author | PHO <pho@cielonegro.org> | 2013-03-14 16:13:45 +0900 |
|---|---|---|
| committer | Ian Lynagh <ian@well-typed.com> | 2013-03-17 01:30:15 +0000 |
| commit | ae3dcaf5884028e4e29a45f724d2d3f5c92a1caf (patch) | |
| tree | 061f9ae9355d37ff9d5e7f629b56d3e24c62ce8f | |
| parent | c84001d5c434ec8d4cf012ec5c0b0f74e372e715 (diff) | |
| download | haskell-ae3dcaf5884028e4e29a45f724d2d3f5c92a1caf.tar.gz | |
Remove a bitrotted hack for OpenBSD and NetBSD regarding the dyn way.
On OpenBSD and NetBSD, we were accidentally passing "-optl-pthread" to
the gcc to build dynamic libraries because of a bitrotted hack for
those OSes, which resulted in a weird situation where every dynamic
library is named "ptl-pthread" and placed at "$(TOP)".
The hack in question were to work around a linkage problem with
libHSffi, but we no longer build it and just use libffi these days so
the hack can safely be removed.
| -rw-r--r-- | compiler/main/DynFlags.hs | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs index c021355bc1..3705846a21 100644 --- a/compiler/main/DynFlags.hs +++ b/compiler/main/DynFlags.hs @@ -1121,16 +1121,8 @@ wayOptl platform WayThreaded = OSOpenBSD -> ["-pthread"] OSNetBSD -> ["-pthread"] _ -> [] -wayOptl _ WayDebug = [] -wayOptl platform WayDyn = - case platformOS platform of - OSOpenBSD -> -- Without this, linking the shared libHSffi fails - -- because it uses pthread mutexes. - ["-optl-pthread"] - OSNetBSD -> -- Without this, linking the shared libHSffi fails - -- because it uses pthread mutexes. - ["-optl-pthread"] - _ -> [] +wayOptl _ WayDebug = [] +wayOptl _ WayDyn = [] wayOptl _ WayProf = [] wayOptl _ WayEventLog = [] wayOptl _ WayPar = ["-L${PVM_ROOT}/lib/${PVM_ARCH}", |