Cross-compilation cleanups

Merged Chris McDonald requested to merge branch/cross_compilation_fixes into branch/default

Fix two small cases where the environment variables for common build tools are ignored.

Merge request reports