[Bug 53861] Non-PE builds fail after "makefiles: Add support for multiple PE architectures."