Sven Tennie pushed to branch wip/romes/hadrian-cross-stage2-rebase_SVEN_FINAL at Glasgow Haskell Compiler / GHC Commits: 9644731a by Sven Tennie at 2026-02-26T13:31:59+00:00 Fix difference between in-tree and out-of-tree GHC test args Done by canonicalizing the pkg db path. - - - - - 1 changed file: - hadrian/src/Settings/Builders/RunTest.hs Changes: ===================================== hadrian/src/Settings/Builders/RunTest.hs ===================================== @@ -18,7 +18,7 @@ import Settings.Builders.Common import qualified Data.Set as Set import Flavour import qualified Context.Type as C -import System.Directory (findExecutable) +import System.Directory (canonicalizePath, findExecutable) import Settings.Program import qualified Context.Type @@ -186,7 +186,7 @@ outOfTreeCompilerArgs = do have_llvm <- (allowHaveLLVM arch &&) <$> liftIO (isJust <$> findExecutable llc_cmd) profiled <- getBooleanSetting TestGhcProfiled - pkgConfCacheFile <- getTestSetting TestGhcPackageDb <&> (> "package.cache") + pkgConfCacheFile <- liftIO . canonicalizePath =<< (getTestSetting TestGhcPackageDb <&> (> "package.cache")) libdir <- getTestSetting TestGhcLibDir rtsLinker <- getBooleanSetting TestGhcWithRtsLinker View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9644731a56ec97ac84759a080a0168e9... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/9644731a56ec97ac84759a080a0168e9... You're receiving this email because of your account on gitlab.haskell.org.
participants (1)
-
Sven Tennie (@supersven)