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

Commits:

1 changed file:

Changes:

  • hadrian/src/Settings/Builders/RunTest.hs
    ... ... @@ -18,7 +18,7 @@ import Settings.Builders.Common
    18 18
     import qualified Data.Set    as Set
    
    19 19
     import Flavour
    
    20 20
     import qualified Context.Type as C
    
    21
    -import System.Directory (findExecutable)
    
    21
    +import System.Directory (canonicalizePath, findExecutable)
    
    22 22
     import Settings.Program
    
    23 23
     import qualified Context.Type
    
    24 24
     
    
    ... ... @@ -186,7 +186,7 @@ outOfTreeCompilerArgs = do
    186 186
         have_llvm <- (allowHaveLLVM arch &&) <$> liftIO (isJust <$> findExecutable llc_cmd)
    
    187 187
         profiled <- getBooleanSetting TestGhcProfiled
    
    188 188
     
    
    189
    -    pkgConfCacheFile <- getTestSetting TestGhcPackageDb <&> (</> "package.cache")
    
    189
    +    pkgConfCacheFile <- liftIO . canonicalizePath =<< (getTestSetting TestGhcPackageDb <&> (</> "package.cache"))
    
    190 190
         libdir <- getTestSetting TestGhcLibDir
    
    191 191
     
    
    192 192
         rtsLinker <- getBooleanSetting TestGhcWithRtsLinker