Added missing environment variable support for cross-compilation