From 03c2de0f4344d013522be3bc5a57b57312075957 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Mon, 7 Feb 2022 12:29:29 +0000 Subject: testsuite: Use absolute paths for config.libdir Fixes #21052 --- hadrian/src/Settings/Builders/RunTest.hs | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/hadrian/src/Settings/Builders/RunTest.hs b/hadrian/src/Settings/Builders/RunTest.hs index 86bd6c7b6f..6a49334a70 100644 --- a/hadrian/src/Settings/Builders/RunTest.hs +++ b/hadrian/src/Settings/Builders/RunTest.hs @@ -106,8 +106,10 @@ inTreeCompilerArgs stg = expr $ do llc_cmd <- settingsFileSetting SettingsFileSetting_LlcCommand have_llvm <- liftIO (isJust <$> findExecutable llc_cmd) - pkgConfCacheFile <- packageDbPath stg <&> (-/- "package.cache") - libdir <- stageLibPath stg + top <- topDirectory + + pkgConfCacheFile <- (top -/-) <$> (packageDbPath stg <&> (-/- "package.cache")) + libdir <- (top -/-) <$> stageLibPath stg rtsLinker <- (== "YES") <$> setting TargetHasRtsLinker -- cgit v1.2.1