Ticket #7770: 0001-Remove-a-bitrotted-hack-for-OpenBSD-and-NetBSD-regar.patch

File 0001-Remove-a-bitrotted-hack-for-OpenBSD-and-NetBSD-regar.patch, 1.7 KB (added by PHO, 2 years ago)
  • compiler/main/DynFlags.hs

    From a989114c9358900221a09228737fc027c7a3825e Mon Sep 17 00:00:00 2001
    From: PHO <[email protected]>
    Date: Thu, 14 Mar 2013 16:13:45 +0900
    Subject: [PATCH] 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.
    ---
     compiler/main/DynFlags.hs | 12 ++----------
     1 file changed, 2 insertions(+), 10 deletions(-)
    
    diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
    index 060619d..7d2ba02 100644
    a b wayOptl platform WayThreaded = 
    11081108        OSOpenBSD  -> ["-pthread"] 
    11091109        OSNetBSD   -> ["-pthread"] 
    11101110        _          -> [] 
    1111 wayOptl _ WayDebug = [] 
    1112 wayOptl platform WayDyn = 
    1113         case platformOS platform of 
    1114         OSOpenBSD -> -- Without this, linking the shared libHSffi fails 
    1115                      -- because it uses pthread mutexes. 
    1116                      ["-optl-pthread"] 
    1117         OSNetBSD -> -- Without this, linking the shared libHSffi fails 
    1118                     -- because it uses pthread mutexes. 
    1119                     ["-optl-pthread"] 
    1120         _ -> [] 
     1111wayOptl _ WayDebug      = [] 
     1112wayOptl _ WayDyn        = [] 
    11211113wayOptl _ WayProf       = [] 
    11221114wayOptl _ WayEventLog   = [] 
    11231115wayOptl _ WayPar        = ["-L${PVM_ROOT}/lib/${PVM_ARCH}",