From febe6fcb35fe6fab31ae9c5c568d18ed8eaa88f3 Mon Sep 17 00:00:00 2001 From: Brian McKenna Date: Sat, 20 Jun 2020 03:38:34 +0000 Subject: [PATCH] Fix behaviour of non-Hadrian builds getFileStatus will resolve symbolic links. getSymbolicLinkStatus doesn't. --- lib/GHCup/Utils.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/GHCup/Utils.hs b/lib/GHCup/Utils.hs index 09f1294..6a6104b 100644 --- a/lib/GHCup/Utils.hs +++ b/lib/GHCup/Utils.hs @@ -54,7 +54,7 @@ import System.IO.Error import System.Posix.FilePath ( getSearchPath , takeFileName ) -import System.Posix.Files.ByteString ( getFileStatus, isSymbolicLink, readSymbolicLink ) +import System.Posix.Files.ByteString ( getSymbolicLinkStatus, isSymbolicLink, readSymbolicLink ) import Text.Regex.Posix import URI.ByteString @@ -434,7 +434,7 @@ ghcToolFiles ver = do -- GHC is moving some builds to Hadrian for bindists, which doesn't create versioned binaries -- https://gitlab.haskell.org/haskell/ghcup-hs/issues/31 isHadrian :: ByteString -> IO Bool - isHadrian = (not . isSymbolicLink <$>) . getFileStatus + isHadrian = (not . isSymbolicLink <$>) . getSymbolicLinkStatus -- | This file, when residing in ~/.ghcup/ghc// signals that