Repository: cordova-windows Updated Branches: refs/heads/master a28491ddd -> bd87ef2ef
CB-9565: Build failure for Windows 10. This error is a result of using x64 Node and an incompatibility with x64 msbuild; the .NET Native compiler is x86 only (for where it can run). As a result, when msbuild-x64 tries to use it, it fails. This works around the issue by running x86 instead. Project: http://git-wip-us.apache.org/repos/asf/cordova-windows/repo Commit: http://git-wip-us.apache.org/repos/asf/cordova-windows/commit/8ea8a719 Tree: http://git-wip-us.apache.org/repos/asf/cordova-windows/tree/8ea8a719 Diff: http://git-wip-us.apache.org/repos/asf/cordova-windows/diff/8ea8a719 Branch: refs/heads/master Commit: 8ea8a719848e296e2cd54b2c5479160a9467046c Parents: ea18891 Author: Rob Paveza <[email protected]> Authored: Tue Sep 22 10:39:19 2015 -0700 Committer: Rob Paveza <[email protected]> Committed: Tue Sep 22 10:42:38 2015 -0700 ---------------------------------------------------------------------- template/cordova/lib/MSBuildTools.js | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cordova-windows/blob/8ea8a719/template/cordova/lib/MSBuildTools.js ---------------------------------------------------------------------- diff --git a/template/cordova/lib/MSBuildTools.js b/template/cordova/lib/MSBuildTools.js index 4d109c7..05c8cda 100644 --- a/template/cordova/lib/MSBuildTools.js +++ b/template/cordova/lib/MSBuildTools.js @@ -77,7 +77,13 @@ function checkMSBuildVersion(version) { // fetch msbuild path from 'reg' output var path = /MSBuildToolsPath\s+REG_SZ\s+(.*)/i.exec(output); if (path) { - deferred.resolve(new MSBuildTools(version, path[1])); + path = path[1]; + // CB-9565: Windows 10 invokes .NET Native compiler, which only runs on x86 arch, + // so if we're running an x64 Node, make sure to use x86 tools. + if (version === '14.0' && path.indexOf('amd64')) { + path = require('path').join(path, '..'); + } + deferred.resolve(new MSBuildTools(version, path)); return; } deferred.resolve(null); // not found --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
