Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Backport: overwrite 'msbuild_toolset' only if 'toolset' is defined #7

Merged

Conversation

richard-townsend-arm
Copy link

See the original PR for details: TryGhost#1242

Tested by doing a complete build of Visual Studio Code for Windows on Arm.

node-gyp uses 'msbuild_toolset' in 'target_defaults' to specify what
toolset should be used, according to what version of Visual Studio
was detected.

Before this change, when 'toolset' was not specified, node-sqlite3
failed to compile with any version of Visual Studio after 2015,
because gyp fails to detect the toolset correctly.

With this change 'toolset' is only used if defined, fixing
compilation with node-gyp and recent VS versions.
@deepak1556 deepak1556 changed the base branch from master to vscode February 20, 2020 23:27
@deepak1556
Copy link

Oops missed the target branch, changed it.

@richard-townsend-arm we consume from vscode branch on these native module forks.

@bpasero bpasero self-assigned this Feb 21, 2020
@bpasero bpasero merged commit 10f5cd4 into microsoft:vscode Feb 21, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants