Sven Tennie pushed to branch wip/supersven/libDir-setting at Glasgow Haskell Compiler / GHC Commits: 7792d0a4 by Sven Tennie at 2026-05-05T08:14:22+02:00 WIP: Relative LibDir is relative to topDir - - - - - 1 changed file: - compiler/GHC/Settings/IO.hs Changes: ===================================== compiler/GHC/Settings/IO.hs ===================================== @@ -152,9 +152,13 @@ initSettings top_dir = do -- LibDir is optional. If not set, derive it from topDir. This allows -- bindists to work without explicitly setting LibDir, but gives us the -- option to override it for inplace test compilers (the "stage2 - -- cross-compiler" scenario). - let lib_dir = fromRight top_dir $ - getRawFilePathSetting top_dir settingsFile mySettings "LibDir" + -- cross-compiler" scenario). If LibDir is a relative path, it is + -- interpreted relative to topDir. + let lib_dir_raw = fromRight top_dir $ + getRawFilePathSetting top_dir settingsFile mySettings "LibDir" + lib_dir = if isRelative lib_dir_raw + then top_dir > lib_dir_raw + else lib_dir_raw return $ Settings { sGhcNameVersion = GhcNameVersion View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7792d0a446bbffd0aa580c56bb41b1bb... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/7792d0a446bbffd0aa580c56bb41b1bb... You're receiving this email because of your account on gitlab.haskell.org.
participants (1)
-
Sven Tennie (@supersven)