simonMar: the recent -odir fix in GHC means the workaround in Cabal has to be (selectively) disabled.