Merge pull request #26799 from obsidiansystems/cross-haskell
haskell infra: Fix cross compilation to work with new system
authored by John Ericson and committed by GitHub 8 years ago ec0c4802 cf3ada04