diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2022-02-07 12:29:29 +0000 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-02-09 03:56:22 -0500 |
| commit | 03c2de0f4344d013522be3bc5a57b57312075957 (patch) | |
| tree | 1c6b989a9f6e5e8720a5f6655d58c4a008f68900 | |
| parent | bd493ed6a63e41855f90c210f6cf1bace9199cf0 (diff) | |
| download | haskell-03c2de0f4344d013522be3bc5a57b57312075957.tar.gz | |
testsuite: Use absolute paths for config.libdir
Fixes #21052
| -rw-r--r-- | hadrian/src/Settings/Builders/RunTest.hs | 6 |
1 files 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 |