The patchset was created before 921fda9260, which added an option to zig_cc_toolchain_config, causing a "soft merge conflict" after merging.
921fda9260