Update for new -staticlib flag