Fix toolchain build script after testing