${CC} --version doesn't need to be queried if both COMPILER_TYPE and
COMPILER_VERSION are known


git-svn-id: svn+ssh://svn.freebsd.org/base/head@275588 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f
The previous commit should have been a logical or not a logical "and"

Pointyhat to: me


git-svn-id: svn+ssh://svn.freebsd.org/base/head@275589 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f