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.

Sign up for GitHub

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

Jump to bottom

fix: ensure native modules use the correct config #35160

Merged
merged 3 commits into from Aug 1, 2022
Merged

fix: ensure native modules use the correct config #35160

merged 3 commits into from Aug 1, 2022

Commits on Aug 1, 2022

  1. fix: ensure native modules are built with config.gypi 

    This works by patching node.h to check that two defines are set using the equivilant of an XNOR operation.  One define "ELECTRON_ENSURE_CONFIG_GYPI" is set via common.gypi which is _already_ used to build native modules and has been since the dawn of time.  Therefore this define will be set for all native module compilations targetting the Electron runtime.  The second define "USING_ELECTRON_CONFIG_GYPI" is only defined when the gypi argument "using_electron_config_gypi" is set to 1 which is only done so via config.gypi.  Only new enough versions of node-gyp correctly use the config.gypi file thus resulting in a compilation error on version of node-gyp that are too old.
    @MarshallOfSound @electron-bot
    MarshallOfSound authored and electron-bot committed Aug 1, 2022
    Copy the full SHA
    234b662 View commit details
    Browse the repository at this point in the history

  2. chore: fix lint

    @VerteDinde @electron-bot
    VerteDinde authored and electron-bot committed Aug 1, 2022
    Copy the full SHA
    d49912f View commit details
    Browse the repository at this point in the history

  3. chore: update patches

    @patchup
    patchup[bot] committed Aug 1, 2022
    Copy the full SHA
    8d679e6 View commit details
    Browse the repository at this point in the history