- let dep_base = remove_suffix '.' dep
- deps = (dep_base ++ hisuf)
- : map (\suf -> dep_base ++ suf ++ '_':hisuf) extra_suffixes
+ let
+ -- In order to construct hi files with alternate suffixes, we
+ -- now have to find the "basename" of the hi file. This is
+ -- difficult because we can't just split the hi filename
+ -- at the last dot - the hisuf might have dots in it. So we
+ -- check whether the hi filename ends in hisuf, and if it does,
+ -- we strip off hisuf, otherwise we strip everything after the
+ -- last dot.
+ dep_base
+ | Just rest <- maybePrefixMatch rev_hisuf rev_dep
+ = reverse rest
+ | otherwise
+ = remove_suffix '.' dep
+ where
+ rev_hisuf = reverse hisuf
+ rev_dep = reverse dep
+
+ deps = dep : map (\suf -> dep_base ++ suf ++ '_':hisuf)
+ extra_suffixes