Fix issues with finding llvm tools again (#7661).

Patch modified from one by Karel Gardas <karel.gardas@centrum.cz>.