Skip to content

fix(make): only generate makefile for multiple toolsets if requested#133

Merged
targos merged 1 commit into
mainfrom
targos-patch-2
Nov 24, 2021
Merged

fix(make): only generate makefile for multiple toolsets if requested#133
targos merged 1 commit into
mainfrom
targos-patch-2

Conversation

@targos

@targos targos commented Nov 23, 2021

Copy link
Copy Markdown
Member

It's already like this in the msvs and ninja generators.

Refs: nodejs/node#40934

It's already like this in the msvs and ninja generators.

Refs: nodejs/node#40934
@targos

targos commented Nov 23, 2021

Copy link
Copy Markdown
Member Author

Here's the definition of CrossCompileRequested:

def CrossCompileRequested():
# TODO: figure out how to not build extra host objects in the
# non-cross-compile case when this is enabled, and enable unconditionally.
return (
os.environ.get("GYP_CROSSCOMPILE")
or os.environ.get("AR_host")
or os.environ.get("CC_host")
or os.environ.get("CXX_host")
or os.environ.get("AR_target")
or os.environ.get("CC_target")
or os.environ.get("CXX_target")
)

@targos

targos commented Nov 23, 2021

Copy link
Copy Markdown
Member Author

The windows build failure is probably unrelated but I don't know what could be causing it:

gyp: Undefined variable PRODUCT_DIR_ABS in deps\openssl\openssl.gyp while loading dependencies of node.gyp while trying to load node.gyp

@richardlau

Copy link
Copy Markdown
Member

The windows build failure is probably unrelated but I don't know what could be causing it:

gyp: Undefined variable PRODUCT_DIR_ABS in deps\openssl\openssl.gyp while loading dependencies of node.gyp while trying to load node.gyp

Wasn't there something about a gyp change for OpenSSL 3 not making it back upstream?

@richardlau

Copy link
Copy Markdown
Member

nodejs/node#40735 (raised by yourself 🙂 )

@targos

targos commented Nov 23, 2021

Copy link
Copy Markdown
Member Author

Right 🤦🏻

@targos

targos commented Nov 24, 2021

Copy link
Copy Markdown
Member Author

Can I please have some reviews? I'd like to ignore the Node.js integration errors again. We can see in nodejs/node#40934 that the patch doesn't break Windows.

@cclauss cclauss left a comment

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@targos targos merged commit f463a77 into main Nov 24, 2021
@targos targos deleted the targos-patch-2 branch November 24, 2021 10:12
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.

3 participants