Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FIXED at Glasgow Haskell Compiler / GHC

Commits:

3 changed files:

Changes:

  • hadrian/src/Rules/Generate.hs
    ... ... @@ -54,7 +54,7 @@ ghcInternalDependencies = do
    54 54
     rtsDependencies :: Expr [FilePath]
    
    55 55
     rtsDependencies = do
    
    56 56
         rtsPath <- staged rtsBuildPath
    
    57
    -    jsTarget <- staged isJsTarget
    
    57
    +    jsTarget <- succStaged isJsTarget
    
    58 58
         useSystemFfi <- succStaged (buildFlag UseSystemFfi)
    
    59 59
     
    
    60 60
         let -- headers common to native and JS RTS
    

  • hadrian/src/Rules/Libffi.hs
    ... ... @@ -159,7 +159,7 @@ libffiRules :: Rules ()
    159 159
     libffiRules = do
    
    160 160
       _ <- addOracleCache $ \ (LibffiDynLibs stage)
    
    161 161
                              -> do
    
    162
    -                              jsTarget <- isJsTarget (succStage stage)
    
    162
    +                              jsTarget <- isJsTarget stage
    
    163 163
                                   if jsTarget
    
    164 164
                                     then return []
    
    165 165
                                     else readFileLines =<< dynLibManifest stage
    

  • hadrian/src/Rules/Register.hs
    ... ... @@ -150,7 +150,7 @@ buildConfFinal rs context@Context {..} _conf = do
    150 150
     
    
    151 151
         -- Special package cases (these should ideally be rolled into Cabal).
    
    152 152
         when (package == rts) $ do
    
    153
    -        jsTarget <- isJsTarget stage
    
    153
    +        jsTarget <- isJsTarget (succStage stage)
    
    154 154
     
    
    155 155
             -- If Cabal knew about "generated-headers", we could read them from the
    
    156 156
             -- 'configuredCabal' information, and just "need" them here.