use better workaround for BZ1105901

Leave gcc in the "main" install section to minimize diff churn.