[Git][ghc/ghc][wip/toolchain-selection] Fixes

[Rodrigo Mesquita (@alt-romes)]

Rodrigo Mesquita pushed to branch wip/toolchain-selection at Glasgow Haskell Compiler / GHC


Commits:
1ef20301 by Rodrigo Mesquita at 2023-06-26T16:55:57+01:00
Fixes

- - - - -


1 changed file:

- utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs


Changes:

=====================================
utils/ghc-toolchain/src/GHC/Toolchain/Tools/Link.hs
=====================================
@@ -26,18 +26,6 @@ data CcLink = CcLink { ccLinkProgram :: Program
                      }
     deriving (Read, Eq, Ord)
 
--- These instances are more suitable for diffing
-instance Show CcLink where
-  show CcLink{..} = unlines
-    [ "CcLink"
-    , "{ ccLinkProgram = " ++ show ccLinkProgram
-    , ", ccLinkSupportsNoPie = " ++ show ccLinkSupportsNoPie
-    , ", ccLinkSupportsCompactUnwind = " ++ show ccLinkSupportsCompactUnwind
-    , ", ccLinkSupportsFilelist = " ++ show ccLinkSupportsFilelist
-    , ", ccLinkIsGnu = " ++ show ccLinkIsGnu
-    , "}"
-    ]
-
 _ccLinkProgram :: Lens CcLink Program
 _ccLinkProgram = Lens ccLinkProgram (\x o -> o{ccLinkProgram=x})
 
@@ -185,14 +173,7 @@ checkLinkWorks cc ccLink = withTempDir $ \dir -> do
 
 checkLinkIsGnu :: Program -> M Bool
 checkLinkIsGnu ccLink = do
-<<<<<<< HEAD
   out <- readProgramStdout ccLink ["-Wl,--version"]
-||||||| parent of 4a31527a36e (ghc-toolchain: set CC LD plat. dependent flags)
-  out <- readProgramStdout ccLink ["--version"]
-=======
-  -- ROMES:TODO: Possibly try all these with -Wl,...
-  out <- readProgramStdout ccLink ["--version"]
->>>>>>> 4a31527a36e (ghc-toolchain: set CC LD plat. dependent flags)
   return ("GNU" `isInfixOf` out)
 
 -- | Check for binutils bug #16177 present in some versions of the bfd ld



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1ef2030147c03de2546141fb3d2697e25c1aa6fb

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1ef2030147c03de2546141fb3d2697e25c1aa6fb
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20230626/d861dba3/attachment-0001.html>