Ensure that the variable value is forced into the global scope.
Merge branch 'bug-18454-standardize-build-configurations'