Repository : ssh://darcs.haskell.org//srv/darcs/packages/Cabal On branch : master
http://hackage.haskell.org/trac/ghc/changeset/c8ebd66a32865f72ae03ee0663c62df3d77f08fe >--------------------------------------------------------------- commit c8ebd66a32865f72ae03ee0663c62df3d77f08fe Author: Ian Lynagh <[email protected]> Date: Sun Mar 18 17:09:38 2012 +0000 Add strip.exe to the list of programs we look for in GHC's mingw installation In particular, this fixes the case where strip in your path is a Win32 strip, but you are using a Win64 GHC. >--------------------------------------------------------------- Cabal/Distribution/Simple/GHC.hs | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/Cabal/Distribution/Simple/GHC.hs b/Cabal/Distribution/Simple/GHC.hs index 2f6d616..b305c08 100644 --- a/Cabal/Distribution/Simple/GHC.hs +++ b/Cabal/Distribution/Simple/GHC.hs @@ -268,6 +268,12 @@ configureToolchain ghcProg ghcInfo = then mingwBinDir </> binPrefix ++ "ar.exe" else libDir </> "ar.exe" ] } + . addKnownProgram stripProgram { + programFindLocation = findProg stripProgram + [ if ghcVersion >= Version [6,12] [] + then mingwBinDir </> binPrefix ++ "strip.exe" + else libDir </> "strip.exe" ] + } where Just ghcVersion = programVersion ghcProg compilerDir = takeDirectory (programPath ghcProg) _______________________________________________ Cvs-libraries mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-libraries
