[OS-BUILD PATCH] Remove cc lines from automatic configs