[Git][ghc/ghc][wip/ghc-9.6.7-backports] hadrian: don't pass -this-package-name to GHC 9.2

[Luite Stegeman (@luite)]

Luite Stegeman pushed to branch wip/ghc-9.6.7-backports at Glasgow Haskell Compiler / GHC


Commits:
7def1f40 by Luite Stegeman at 2025-01-22T13:32:28+01:00
hadrian: don't pass -this-package-name to GHC 9.2

it's not supported

- - - - -


1 changed file:

- hadrian/src/Settings/Builders/Ghc.hs


Changes:

=====================================
hadrian/src/Settings/Builders/Ghc.hs
=====================================
@@ -247,10 +247,10 @@ packageGhcArgs = do
             , packageDatabaseArgs
             -- We want to pass -this-unit-id for executables as well for multi-repl to
             -- work with executable packages but this is buggy on GHC-9.0.2
-            , (isLibrary package || (ghc_ver >= makeVersion [9,2,1])) ? mconcat
-                [ arg ("-this-unit-id " ++ pkgId)
-                , arg ("-this-package-name " ++ pkgName)
-                ]
+            , (isLibrary package || (ghc_ver >= makeVersion [9,2,1])) ?
+                arg ("-this-unit-id " ++ pkgId)
+            , (isLibrary package || (ghc_ver >= makeVersion [9,4,1])) ?
+                arg ("-this-package-name " ++ pkgName)
             , map ("-package-id " ++) <$> getContextData depIds ]
 
 includeGhcArgs :: Args



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7def1f4088c508cb3aeb2d9d49a421311356d86c

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7def1f4088c508cb3aeb2d9d49a421311356d86c
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20250122/f84be9f0/attachment-0001.html>