Hi Steven,

Thanks for the fix!
I've tried your patch with a minor fix as attached.
1            2           3                4
Build Duration:        00:05:51  00:03:47  00:05:15  00:04:31
AutoGen Duration:  00:03:32  00:03:08  00:03:14  00:03:16
Make Duration:       00:01:50  00:00:16  00:01:29  00:00:50
GenFds Duration:   00:00:30  00:00:22  00:00:31  00:00:23

1: clean build with patch and --hash
2: incremental build
3. clean build without patch and without --hash
4. incremental build

BTW, this data cannot compare with previous data I provided because they are built in different environment.

In general, the result is as you said that it fix --hash functionality, but not as quick as before.
Also the cost of --hash in clean build is increased.