[Git][ghc/ghc][wip/ghc-9.6.7-backports] hadrian: fix condition for -this-package-name

[Luite Stegeman (@luite)]

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


Commits:
4ccbf2ce by Luite Stegeman at 2025-01-23T00:06:09+01:00
hadrian: fix condition for -this-package-name

- - - - -


1 changed file:

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


Changes:

=====================================
hadrian/src/Settings/Builders/Ghc.hs
=====================================
@@ -247,9 +247,9 @@ 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])) ?
+            , (isLibrary package || (ghc_ver >= makeVersion [9,2,1])) ?
                 arg ("-this-unit-id " ++ pkgId)
-            , (isLibrary package && (ghc_ver >= makeVersion [9,4,1])) ?
+            , (ghc_ver >= makeVersion [9,4,1]) ?
                 arg ("-this-package-name " ++ pkgName)
             , map ("-package-id " ++) <$> getContextData depIds ]
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4ccbf2ce5c1a6a9c44873f5e3067571261f40278

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/4ccbf2ce5c1a6a9c44873f5e3067571261f40278
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/e3536b93/attachment-0001.html>