From: Ian Lynagh Date: Fri, 25 Mar 2011 15:53:54 +0000 (+0000) Subject: Bindist comparison tool: Recognise OS X .dylib files too X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=commitdiff_plain;h=ff903cd0515c0bd16281de142863a7f1acfa394b Bindist comparison tool: Recognise OS X .dylib files too --- diff --git a/distrib/compare/compare.hs b/distrib/compare/compare.hs index 1fa2c73..d1a8ac7 100644 --- a/distrib/compare/compare.hs +++ b/distrib/compare/compare.hs @@ -161,7 +161,7 @@ mkFileNameDescr filename return [FP prog, FP "-", VersionOf "ghc", FP exe] `mplus` unchanged | Just [thing, thingVersion, _, ghcVersion, _, soDll] - <- re ("^libHS(.*)-" ++ versionRE ++ "-ghc" ++ versionRE ++ "\\.(so|dll)$") + <- re ("^libHS(.*)-" ++ versionRE ++ "-ghc" ++ versionRE ++ "\\.(so|dll|dylib)$") filename = do haveThingVersion "ghc" ghcVersion haveThingVersion thing thingVersion @@ -169,14 +169,14 @@ mkFileNameDescr filename FP "-ghc", VersionOf "ghc", FP ".", FP soDll] `mplus` unchanged | Just [way, thingVersion, _, soDll] - <- re ("^libHSrts(_.*)?-ghc" ++ versionRE ++ "\\.(so|dll)$") + <- re ("^libHSrts(_.*)?-ghc" ++ versionRE ++ "\\.(so|dll|dylib)$") filename = do haveThingVersion "ghc" thingVersion return [FP "libHSrts", FP way, FP "-ghc", VersionOf "ghc", FP ".", FP soDll] `mplus` unchanged | Just [thingVersion, _, soDll] - <- re ("^libHSffi-ghc" ++ versionRE ++ "\\.(so|dll)$") + <- re ("^libHSffi-ghc" ++ versionRE ++ "\\.(so|dll|dylib)$") filename = do haveThingVersion "ghc" thingVersion return [FP "libHSffi-ghc", VersionOf "ghc", FP ".", FP soDll]