Read architecture from node-gyp correctly #491
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
It was executing node-gyp configure and trying to read the arch from the output, but was doing so by looking at a string that printed was platform gyp was running on rather than the target platform. node-gyp --build does output the target architecture though, so parse it from that.
kjvalencik
reviewed
Feb 18, 2020
| @@ -164,18 +164,19 @@ mod build { | |||
| } | |||
|
|
|||
| if cfg!(windows) { | |||
| let node_gyp_output = String::from_utf8_lossy(&output.stderr); | |||
| println!("cargo:node_arch={}", parse_node_arch(&node_gyp_output)); | |||
There was a problem hiding this comment.
node_gyp_output no longer exists. Does it need to be passed into this method?
There was a problem hiding this comment.
Oops - that line shouldn't have been deleted - fixed. (For complex dependency reasons I had to backport the fix to 0.3.x to test it and had to manually merge as the indenting level had changed, so must have missed this one).
|
@dbkr Thanks for contributing a fix! Can you take a look at the build failures? Thanks! |
That line needs to stay for the root dir / lib file
|
Hi - is anything further needed from me on this? We'd like to start releasing builds soon so are very keen for #490 to be fixed, otherwise we'll have to find a workaround. |
|
@dherman can you take a look at this? I'm not familiar enough with this code to review. |
dherman
approved these changes
May 16, 2020
This was referenced Jun 6, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reads the target architecture from the output of
node-gyp buildwhich prints the target architecture rather than the 'using' string thatnode-gypprints (which is the platform it's running on).This allows neon projects to build on platforms where the host's node binary is of a different architecture to the target architecture (eg. on Windows when building for x86 on an x64 host, even if using native x86 toolchains).
Fixes #490