Fix after merge of ghc-prim into ghc-internal

Author: hsyl20

Build.hs

@@ -167,6 +167,8 @@ buildGhcStage1 opts cabal ghc0 dst = do
     ExitSuccess -> pure ()
     ExitFailure n -> do
       putStrLn $ "cabal-install failed with error code: " ++ show n
+      putStrLn cabal_stdout
+      putStrLn cabal_stderr
       putStrLn $ "Logs can be found in \"" ++ dst ++ "/cabal.{stdout,stderr}\""
       exitFailure
 
@@ -496,17 +498,17 @@ buildBootLibraries cabal ghc ghcpkg derive_constants genapply genprimop opts dst
   run_genapply [derived_constants, "-V32"] (src_rts </> "AutoApply_V32.cmm")
   run_genapply [derived_constants, "-V64"] (src_rts </> "AutoApply_V64.cmm")
 
-  -- Generate primop code for ghc-prim
+  -- Generate primop code for ghc-internal
   --
-  -- Note that this can't be done in a Setup.hs for ghc-prim because
+  -- Note that this can't be done in a Setup.hs for ghc-internal because
   -- cabal-install can't build Setup.hs because it depends on base, Cabal, etc.
   -- libraries that aren't built yet.
   let primops_txt    = src </> "libraries/ghc/GHC/Builtin/primops.txt"
   let primops_txt_pp = primops_txt <.> ".pp"
   primops <- readCreateProcess (shell $ "gcc -E -undef -traditional -P -x c " ++ primops_txt_pp) ""
   writeFile primops_txt primops
-  writeFile (src </> "libraries/ghc-prim/GHC/Prim.hs") =<< readCreateProcess (runGenPrimop genprimop ["--make-haskell-source"]) primops
-  writeFile (src </> "libraries/ghc-prim/GHC/PrimopWrappers.hs") =<< readCreateProcess (runGenPrimop genprimop ["--make-haskell-wrappers"]) primops
+  writeFile (src </> "libraries/ghc-internal/src/GHC/Internal/Prim.hs") =<< readCreateProcess (runGenPrimop genprimop ["--make-haskell-source"]) primops
+  writeFile (src </> "libraries/ghc-internal/src/GHC/Internal/PrimopWrappers.hs") =<< readCreateProcess (runGenPrimop genprimop ["--make-haskell-wrappers"]) primops
 
   -- build libffi
   msg "  - Building libffi..."

compiler/GHC/Driver/Pipeline.hs

@@ -49,6 +49,8 @@ import GHC.Platform
 
 import GHC.Utils.Monad ( MonadIO(liftIO), mapMaybeM )
 
+import GHC.Builtin.Names
+
 import GHC.Driver.Main
 import GHC.Driver.Env hiding ( Hsc )
 import GHC.Driver.Errors
@@ -91,6 +93,7 @@ import GHC.Data.StringBuffer   ( hPutStringBuffer )
 import GHC.Data.Maybe          ( expectJust )
 
 import GHC.Iface.Make          ( mkFullIface )
+import GHC.Iface.Load          ( getGhcPrimIface )
 import GHC.Runtime.Loader      ( initializePlugins )
 
 
@@ -817,7 +820,13 @@ hscGenBackendPipeline pipe_env hsc_env mod_sum result = do
         let !linkable = Linkable part_time (ms_mod mod_sum) (NE.singleton (DotO final_object ModuleObject))
         -- Add the object linkable to the potential bytecode linkable which was generated in HscBackend.
         return (mlinkable { homeMod_object = Just linkable })
-  return (miface, final_linkable)
+
+  -- when building ghc-internal with cabal-install, we still want the virtual
+  -- interface for gHC_PRIM in the cache
+  let miface_final
+        | ms_mod mod_sum == gHC_PRIM = getGhcPrimIface hsc_env
+        | otherwise                  = miface
+  return (miface_final, final_linkable)
 
 asPipeline :: P m => Bool -> PipeEnv -> HscEnv -> Maybe ModLocation -> FilePath -> m (Maybe ObjFile)
 asPipeline use_cpp pipe_env hsc_env location input_fn =