X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=distrib%2Fcompare%2Fcompare.hs;fp=distrib%2Fcompare%2Fcompare.hs;h=d1a8ac7fddeaca7ba817373e64a10506478fc607;hp=1fa2c739af7ca847071b8199dac84c78bace29e3;hb=ff903cd0515c0bd16281de142863a7f1acfa394b;hpb=9c5838466769fb9d5fd2cc4cc677852fd798af03 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]