From d8dea07bbaef8840736545571bf557d556002bef Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 21 Mar 2011 22:31:07 +0000 Subject: [PATCH] Hack to get the compare tool to work on Windows "bindists" --- distrib/compare/compare.hs | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/distrib/compare/compare.hs b/distrib/compare/compare.hs index 7d52609..8daa773 100644 --- a/distrib/compare/compare.hs +++ b/distrib/compare/compare.hs @@ -34,10 +34,15 @@ main = do args <- getArgs doit :: Bool -> FilePath -> FilePath -> IO () doit ignoreSizeChanges bd1 bd2 - = do tls1 <- readTarLines bd1 + = do let windows = any ("mingw" `isPrefixOf`) (tails bd1) + tls1 <- readTarLines bd1 tls2 <- readTarLines bd2 - ways1 <- dieOnErrors $ findWays tls1 - ways2 <- dieOnErrors $ findWays tls2 + -- If it looks like we have a Windows "bindist" then just + -- set ways to [] for now. + ways1 <- if windows then return [] + else dieOnErrors $ findWays tls1 + ways2 <- if windows then return [] + else dieOnErrors $ findWays tls2 content1 <- dieOnErrors $ mkContents ways1 tls1 content2 <- dieOnErrors $ mkContents ways2 tls2 let mySort = sortBy (compare `on` fst) -- 1.7.10.4