For reference, I had already figured out one fix on my own, commenting out the:
# “compile” : [ “march=prescott” ],
line from basic.settings, so that’s why the error I reported is different from the first error that someone else might see. 
But I replaced those 3 files with yours, and it compiled just fine. Thanks!