GitLab

d4c43fdc
by Sven Tennie at 2025-09-21T09:25:07+02:00
```
WIP libffi isJsTarget
```

@@ -54,7 +54,7 @@ ghcInternalDependencies = do
  rtsDependencies :: Expr [FilePath]
  rtsDependencies = do
      rtsPath <- staged rtsBuildPath
 -    jsTarget <- staged isJsTarget
 +    jsTarget <- succStaged isJsTarget
      useSystemFfi <- succStaged (buildFlag UseSystemFfi)
      let -- headers common to native and JS RTS

@@ -69,7 +69,7 @@ dynLibManifest = dynLibManifest' buildRoot
  -- | Need the (locally built) libffi library.
  needLibffi :: Stage -> Action ()
  needLibffi stage = do
 -    jsTarget <- isJsTarget stage
 +    jsTarget <- isJsTarget (succStage stage)
      unless jsTarget $ do
          manifest <- dynLibManifest stage
          need [manifest]

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

@@ -130,7 +130,7 @@ needRtsLibffiTargets :: Stage -> Action [FilePath]
  needRtsLibffiTargets stage = do
      rtsPath      <- rtsBuildPath stage
      useSystemFfi <- buildFlag UseSystemFfi (succStage stage)
 -    jsTarget     <- isJsTarget stage
 +    jsTarget     <- isJsTarget (succStage stage)
      -- Header files (in the rts build dir).
      let headers = fmap ((rtsPath -/- "include") -/-) libffiHeaderFiles