Add missing .hi-boot dependencies with ghc -M (#14482)

2 files changed, 19 insertions, 1 deletions

diff --git a/compiler/GHC/Driver/MakeFile.hs b/compiler/GHC/Driver/MakeFile.hs
index 2328a32ec5..d513728036 100644
--- a/compiler/GHC/Driver/MakeFile.hs
+++ b/compiler/GHC/Driver/MakeFile.hs
@@ -47,7 +47,7 @@ import System.Directory
 import System.FilePath
 import System.IO
 import System.IO.Error  ( isEOFError )
-import Control.Monad    ( when )
+import Control.Monad    ( when, forM_ )
 import Data.Maybe       ( isJust )
 import Data.IORef
 import qualified Data.Set as Set
@@ -241,6 +241,16 @@ processDeps dflags hsc_env excl_mods root hdl (AcyclicSCC (ModuleNode (ExtendedM
                 -- Something like       A.o : A.hs
         ; writeDependency root hdl obj_files src_file
 
+          -- add dependency between objects and their corresponding .hi-boot
+          -- files if the module has a corresponding .hs-boot file (#14482)
+        ; when (isBootSummary node == IsBoot) $ do
+            let hi_boot = msHiFilePath node
+            let obj     = removeBootSuffix (msObjFilePath node)
+            forM_ extra_suffixes $ \suff -> do
+               let way_obj     = insertSuffixes obj     [suff]
+               let way_hi_boot = insertSuffixes hi_boot [suff]
+               mapM_ (writeDependency root hdl way_obj) way_hi_boot
+
                 -- Emit a dependency for each CPP import
         ; when (depIncludeCppDeps dflags) $ do
             -- CPP deps are descovered in the module parsing phase by parsing
diff --git a/compiler/GHC/Unit/Module/Location.hs b/compiler/GHC/Unit/Module/Location.hs
index 6f239227f0..ff5354bfdb 100644
--- a/compiler/GHC/Unit/Module/Location.hs
+++ b/compiler/GHC/Unit/Module/Location.hs
@@ -5,6 +5,7 @@ module GHC.Unit.Module.Location
    , addBootSuffix_maybe
    , addBootSuffixLocn
    , addBootSuffixLocnOut
+   , removeBootSuffix
    )
 where
 
@@ -54,6 +55,13 @@ instance Outputable ModLocation where
 addBootSuffix :: FilePath -> FilePath
 addBootSuffix path = path ++ "-boot"
 
+-- | Remove the @-boot@ suffix to .hs, .hi and .o files
+removeBootSuffix :: FilePath -> FilePath
+removeBootSuffix "-boot" = []
+removeBootSuffix (x:xs)  = x : removeBootSuffix xs
+removeBootSuffix []      = error "removeBootSuffix: no -boot suffix"
+
+
 -- | Add the @-boot@ suffix if the @Bool@ argument is @True@
 addBootSuffix_maybe :: IsBootInterface -> FilePath -> FilePath
 addBootSuffix_maybe is_boot path = case is_boot of