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

Commits:

• 5bbd7336
  by Sven Tennie at 2026-06-13T17:55:39+00:00

  hadrian: regenerate bindist settings against the library_stage
  
  Use library_stage (Stage2 for cross builds) when regenerating the
  bindist lib/settings file, so that:
  
    * 'unlit command' picks up the cross-prefixed wasm32-wasi-unlit
      rather than the bootstrap 'unlit', matching the binary actually
      shipped in bin/.
    * 'Use interpreter' resolves to YES for wasm32-wasi (Stage1's
      target supports the interpreter), matching the autoconf logic
      in config.mk.in that 'make install' uses to regenerate the file.
    * 'RTS ways' is the set advertised by build.mk (also generated
      against library_stage), removing the inconsistency between
      settings and the install-time Makefile.
  
  Previously the call passed executable_stage (Stage1), which made
  generateSettings' compilerStage = predStage Stage1 = Stage0 and
  queried the bootstrap toolchain instead of the shipped cross
  compiler.
  
  Also drop the createDirectory call for lib/bin: the bindist Makefile
  never writes there (binaries are installed to \${ghclibdir}/bin), so
  the empty directory served no purpose.
  

1 changed file:

• hadrian/src/Rules/BinaryDist.hs

Changes:

     createDirectory bindistFilesDir

     createDirectory (bindistFilesDir -/- "bin")

     createDirectory (bindistFilesDir -/- "lib")

-    createDirectory (bindistFilesDir -/- "lib" -/- "bin")

     -- Also create wrappers with version suffixes (#20074)

     forM_ bin_targets $ \(pkg, prog_path) -> do

         let orig_filename = takeFileName prog_path

     -- relocatable. The package DB is always at "package.conf.d" relative to

     -- the lib dir, matching the known bindist layout.

     let bindistSettings = bindistFilesDir -/- "lib" -/- "settings"

-        bindistContext = vanillaContext executable_stage compiler

+        bindistContext = vanillaContext library_stage compiler

     bindistSettingsContent <- interpretInContext bindistContext $

         generateSettings bindistSettings False "package.conf.d"

     writeFile' bindistSettings bindistSettingsContent