diff options
| author | Ian Lynagh <igloo@earth.li> | 2011-03-25 15:53:54 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2011-03-25 15:53:54 +0000 |
| commit | ff903cd0515c0bd16281de142863a7f1acfa394b (patch) | |
| tree | 4e595b898ff83ff7727973c56020f42c52cea182 /distrib | |
| parent | 9c5838466769fb9d5fd2cc4cc677852fd798af03 (diff) | |
| download | haskell-ff903cd0515c0bd16281de142863a7f1acfa394b.tar.gz | |
Bindist comparison tool: Recognise OS X .dylib files too
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/compare/compare.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/distrib/compare/compare.hs b/distrib/compare/compare.hs index 1fa2c739af..d1a8ac7fdd 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] |