Merge pull request #7857 from nerush/fix/settings-definitions

Normalize definitions of compiler settings

Author: anatoliykmetyuk