[Git][ghc/ghc][wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL] Replace artificial "Lib TopDir" setting

26 Feb 2026


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


Commits:
72bc150e by Sven Tennie at 2026-02-26T10:53:04+00:00
Replace artificial "Lib TopDir" setting

Hadrian can simply set "LibDir" instead.

- - - - -


7 changed files:

- compiler/GHC/Driver/Config/Interpreter.hs
- compiler/GHC/Driver/DynFlags.hs
- compiler/GHC/Driver/Session.hs
- compiler/GHC/Settings.hs
- compiler/GHC/Settings/IO.hs
- hadrian/bindist/Makefile
- hadrian/src/Rules/Generate.hs


Changes:

=====================================
compiler/GHC/Driver/Config/Interpreter.hs
=====================================
@@ -17,8 +17,8 @@ import System.Directory
 
 initInterpOpts :: DynFlags -> IO InterpOpts
 initInterpOpts dflags = do
-  wasm_dyld <- makeAbsolute $ libTopDir dflags </> "dyld.mjs"
-  js_interp <- makeAbsolute $ libTopDir dflags </> "ghc-interp.js"
+  wasm_dyld <- makeAbsolute $ libDir dflags </> "dyld.mjs"
+  js_interp <- makeAbsolute $ libDir dflags </> "ghc-interp.js"
   pure $ InterpOpts
     { interpExternal = gopt Opt_ExternalInterpreter dflags
     , interpProg = pgm_i dflags


=====================================
compiler/GHC/Driver/DynFlags.hs
=====================================
@@ -60,7 +60,7 @@ module GHC.Driver.DynFlags (
 
         -- ** System tool settings and locations
         programName, projectVersion,
-        ghcUsagePath, ghciUsagePath, topDir, libTopDir, toolDir,
+        ghcUsagePath, ghciUsagePath, topDir, libDir, toolDir,
         versionedAppDir, versionedFilePath,
         extraGccViaCFlags, globalPackageDatabasePath,
 
@@ -1506,8 +1506,8 @@ ghciUsagePath         :: DynFlags -> FilePath
 ghciUsagePath dflags = fileSettings_ghciUsagePath $ fileSettings dflags
 topDir                :: DynFlags -> FilePath
 topDir dflags = fileSettings_topDir $ fileSettings dflags
-libTopDir                :: DynFlags -> FilePath
-libTopDir dflags = fileSettings_libTopDir $ fileSettings dflags
+libDir                :: DynFlags -> FilePath
+libDir dflags = fileSettings_libDir $ fileSettings dflags
 toolDir               :: DynFlags -> Maybe FilePath
 toolDir dflags = fileSettings_toolDir $ fileSettings dflags
 extraGccViaCFlags     :: DynFlags -> [String]


=====================================
compiler/GHC/Driver/Session.hs
=====================================
@@ -3647,7 +3647,6 @@ compilerInfo dflags
        -- Whether or not GHC was compiled using -prof
        ("GHC Profiled",                showBool hostIsProfiled),
        ("Debug on",                    showBool debugIsOn),
-       ("LibDir",                      libTopDir dflags),
        -- This is always an absolute path, unlike "Relative Global Package DB" which is
        -- in the settings file.
        ("Global Package DB",           globalPackageDatabasePath dflags)


=====================================
compiler/GHC/Settings.hs
=====================================
@@ -184,7 +184,7 @@ data FileSettings = FileSettings
   , fileSettings_toolDir               :: Maybe FilePath -- ditto
   , fileSettings_topDir                :: FilePath       -- ditto
   , fileSettings_globalPackageDatabase :: FilePath
-  , fileSettings_libTopDir             :: FilePath
+  , fileSettings_libDir                :: FilePath
   }
 
 


=====================================
compiler/GHC/Settings/IO.hs
=====================================
@@ -148,7 +148,7 @@ initSettings top_dir = do
 
   baseUnitId <- getSetting_raw "base unit-id"
 
-  lib_top_dir <- getSetting "Lib TopDir"
+  lib_dir <- getSetting "LibDir"
 
   return $ Settings
     { sGhcNameVersion = GhcNameVersion
@@ -161,7 +161,7 @@ initSettings top_dir = do
       , fileSettings_ghciUsagePath  = ghci_usage_msg_path
       , fileSettings_toolDir        = mtool_dir
       , fileSettings_topDir         = top_dir
-      , fileSettings_libTopDir      = lib_top_dir
+      , fileSettings_libDir         = lib_dir
       , fileSettings_globalPackageDatabase = globalpkgdb_path
       }
 


=====================================
hadrian/bindist/Makefile
=====================================
@@ -90,7 +90,7 @@ lib/settings : config.mk
 	@echo ',("RTS ways", "$(GhcRTSWays)")' >> $@
 	@echo ',("Relative Global Package DB", "package.conf.d")' >> $@
 	@echo ',("base unit-id", "$(BaseUnitId)")' >> $@
-	@echo ',("Lib TopDir", "$$topdir/")' >> $@
+	@echo ',("LibDir", "$$topdir/lib")' >> $@
 	@echo "]" >> $@
 
 lib/targets/default.target : config.mk default.target


=====================================
hadrian/src/Rules/Generate.hs
=====================================
@@ -507,7 +507,7 @@ generateSettings settingsFile = do
         , ("RTS ways",  unwords . map show . Set.toList <$> getRtsWays)
         , ("Relative Global Package DB", pure rel_pkg_db)
         , ("base unit-id", pure base_unit_id)
-        , ("Lib TopDir", pure lib_topDir)
+        , ("LibDir", pure lib_topDir)
         ]
     let showTuple (k, v) = "(" ++ show k ++ ", " ++ show v ++ ")"
     pure $ case settings of



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/72bc150e0213e310dbca2cb59d6ebd3e...

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/72bc150e0213e310dbca2cb59d6ebd3e...
You're receiving this email because of your account on gitlab.haskell.org.

    

Sven Tennie (＠supersven)

tags

participants (1)