Axel Huebl authored Feb 05, 2018 and Brad King committed Feb 05, 2018

Add `clang` and `clang++` after the corresponding `gcc` and `g++`
candidates.  Otherwise it is not tried on platforms where we do not
enumerate the toolchain pair candidates.