Hello Bob,

[From Bob]
This patch cause UefiCpuPkg build fail.
build -p UefiCpuPkg\UefiCpuPkg.dsc -a IA32 -t VS2015x86

As said in the cover letter of the v4 available at the link below, I was not able to reproduce the build fail that you pointed out. In the v4, the only thing that I am modifying is a condition on the makefile type. Hopefully this should only impact the build on Windows platforms using GNU makefiles. Thus there should not be any reason not to build on Windows platform using nmake makefiles. Feel free to modify this patch if you see what needs to be done.
V4 of "BaseTools: Remove caret in NASM_INC": https://edk2.groups.io/g/devel/message/54125

Regards,
Pierre