[commit: ghc] wip/angerman/llvmng: Allow the rts lib to be called rts-1.0 (023bcda)

git at git.haskell.org git at git.haskell.org
Tue Nov 14 14:26:20 UTC 2017


Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/angerman/llvmng
Link       : http://ghc.haskell.org/trac/ghc/changeset/023bcdaf8e08aad45bf17db780a91b091ebeab4b/ghc

>---------------------------------------------------------------

commit 023bcdaf8e08aad45bf17db780a91b091ebeab4b
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Mon Nov 13 17:39:19 2017 +0800

    Allow the rts lib to be called rts-1.0
    
    Summary: When using the `rts.cabal` file the rts lirbary ends up being `rts-1.0` instead of `rts`. As sucht it's called `libHSrts-1.0` instead of `libHSrts`. A fun consequence of this is, that when asking ghc to link a `-treaded` program, it fails to mutate the `rts` lib selection into the threaded variant.
    
    Reviewers: bgamari, simonmar
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D4187
    
    # Conflicts:
    #	hadrian


>---------------------------------------------------------------

023bcdaf8e08aad45bf17db780a91b091ebeab4b
 compiler/main/Packages.hs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs
index 949cc0f..6effbab 100644
--- a/compiler/main/Packages.hs
+++ b/compiler/main/Packages.hs
@@ -1730,6 +1730,7 @@ packageHsLibs dflags p = map (mkDynName . addSuffix) (hsLibraries p)
             = panic ("Don't understand library name " ++ x)
 
         addSuffix rts@"HSrts"    = rts       ++ (expandTag rts_tag)
+        addSuffix rts@"HSrts-1.0"= rts       ++ (expandTag rts_tag)
         addSuffix other_lib      = other_lib ++ (expandTag tag)
 
         expandTag t | null t = ""



More information about the ghc-commits mailing list