Otherwise comparisons would fail for compiler versions above 10.
Also simplified code somewhat to avoid using subprocess too much
needlessly.

(cherry picked from commits c7dc5142b56b3f52ba9c2746eb4855fae68ed26e
and df7ecfc4a7f8403144be2aa49bb47f9ead25926b)