Adjust build scripts for Savage

Refs #12352.