[commit: ghc] master: Allow the rts lib to be called rts-1.0 (d0a641a)

git at git.haskell.org git at git.haskell.org
Wed Nov 15 20:05:55 UTC 2017


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

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/d0a641a33d1f3c722813b95ac81ca207071cbf83/ghc

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

commit d0a641a33d1f3c722813b95ac81ca207071cbf83
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Wed Nov 15 11:41:15 2017 -0500

    Allow the rts lib to be called rts-1.0
    
    Reviewers: bgamari, simonmar
    
    Reviewed By: bgamari
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D4187


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

d0a641a33d1f3c722813b95ac81ca207071cbf83
 compiler/main/Packages.hs | 12 ++++++++++++
 1 file changed, 12 insertions(+)

diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs
index 949cc0f..c49581b 100644
--- a/compiler/main/Packages.hs
+++ b/compiler/main/Packages.hs
@@ -1729,7 +1729,19 @@ packageHsLibs dflags p = map (mkDynName . addSuffix) (hsLibraries p)
          | otherwise
             = panic ("Don't understand library name " ++ x)
 
+        -- Add _thr and other rts suffixes to packages named
+        -- `rts` or `rts-1.0`. Why both?  Traditionally the rts
+        -- package is called `rts` only.  However the tooling
+        -- usually expects a package name to have a version.
+        -- As such we will gradually move towards the `rts-1.0`
+        -- package name, at which point the `rts` package name
+        -- will eventually be unused.
+        --
+        -- This change elevates the need to add custom hooks
+        -- and handling specifically for the `rts` package for
+        -- example in ghc-cabal.
         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