Improve build portability.