From 0cead37a1f60cacc13914e97ba575ba467cd122b Mon Sep 17 00:00:00 2001 From: Erik de Castro Lopo Date: Thu, 7 Sep 2023 13:17:23 +1000 Subject: [PATCH] debug in progress --- Cabal/src/Distribution/Simple/Program/Builtin.hs | 3 ++- Cabal/src/Distribution/Simple/Setup/Common.hs | 4 +++- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/Cabal/src/Distribution/Simple/Program/Builtin.hs b/Cabal/src/Distribution/Simple/Program/Builtin.hs index 1f3db0740f3..9e233b35b2e 100644 --- a/Cabal/src/Distribution/Simple/Program/Builtin.hs +++ b/Cabal/src/Distribution/Simple/Program/Builtin.hs @@ -362,7 +362,8 @@ ldProgram = -- choice for windows linking does not support this feature. However -- if using binutils ld or another linker that supports --relocatable, -- we should still be good to generate pre-linked objects. - ldHelpOutput <- + ldHelpOutput <- do + _ <- error "Distribution.Simple.Program.Builtin.ldProgram" getProgramInvocationOutput verbosity (programInvocation ldProg ["--help"]) diff --git a/Cabal/src/Distribution/Simple/Setup/Common.hs b/Cabal/src/Distribution/Simple/Setup/Common.hs index 0589838f617..7fef84c686c 100644 --- a/Cabal/src/Distribution/Simple/Setup/Common.hs +++ b/Cabal/src/Distribution/Simple/Setup/Common.hs @@ -327,7 +327,9 @@ configureCCompiler configureCCompiler verbosity progdb = configureProg verbosity progdb gccProgram configureLinker :: Verbosity -> ProgramDb -> IO (FilePath, [String]) -configureLinker verbosity progdb = configureProg verbosity progdb ldProgram +configureLinker verbosity progdb = do + _ <- error $ show ldProgram + configureProg verbosity progdb ldProgram configureProg :: Verbosity