Merge pull request #205 from rmsyn/build/robust-cfg

riscv: build: make `cfg` variables more robust
5 jobs for master
in 0 seconds and was queued for 66 minutes and 32 seconds