summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMoritz Angermann <moritz.angermann@gmail.com>2017-11-15 11:41:15 -0500
committerBen Gamari <ben@smart-cactus.org>2017-11-15 14:18:29 -0500
commitd0a641a33d1f3c722813b95ac81ca207071cbf83 (patch)
tree1bb1b9072cd6567af621009ff22a012161a6be26
parentd9f0c24dd01b2f2a9a5ccc2fc45e93064d4ba0c1 (diff)
downloadhaskell-d0a641a33d1f3c722813b95ac81ca207071cbf83.tar.gz
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
-rw-r--r--compiler/main/Packages.hs12
1 files changed, 12 insertions, 0 deletions
diff --git a/compiler/main/Packages.hs b/compiler/main/Packages.hs
index 949cc0f231..c49581b0d9 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 = ""