Fix search pattern for changing c++ configs
More tweaks for cross tools section of musl build