Yes, it builds fine now.
I haven't tried running it yet, for a couple of reasons. One is that I am building on my VirtualBox Ubuntu machine, but running on a native Linux box, so I am using a fork of your repository to pick up the new version of the firmware.
The other reason is that I want the small change I made to default the CST, HOLD and WP pins high so that boot from flash memory works.
My convoluted reason for that is that the main reason I want your new firmware is so that I can use the user USB port rather than an external USB to uart device. And the main program I want to run is one that uses XIP from flash memory, such as Zephyr OS programs. But SpinalHDL XIP only works if I load the bitstream from flash. That is because it does not send the 0xab to the flash memory, and it is rather hard for me to change the SpinalHDL library XIP module. It works if you load the bitstream from flash and use the -s option on icepack, as that means that the ice40 SPI master wakes up the flash and then leaves it powered up.
So I will make my change to the firmware before I use it.