Remove irrelevant and commented-out code
Ensure that the correct package name is used ('GCC')

In Clang-based toolchains, COMPILER_MODULE_NAME includes two items: 'Clang' and
'GCC'