test-diagram still fails, however let's make our toolchain files a good reference.
Mostly just so that the two options don't look the same.
In the end, all seems to work fairly well on Windows 10.