Skip to content

build: fix ffi dependency compilation #62731

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

Merged
nodejs-github-bot merged 4 commits into from
Apr 15, 2026
+15 −32
Merged

build: fix ffi dependency compilation #62731

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3418d7e
build: fix ffi dependency compilation
ShogunPanda Apr 14, 2026
8305199
fixup
ShogunPanda Apr 14, 2026
9467757
fixup
ShogunPanda Apr 14, 2026
c68e4f7
fixup
ShogunPanda Apr 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
fixup 
Signed-off-by: Paolo Insogna <paolo@cowtech.it>
  • Loading branch information
@ShogunPanda
ShogunPanda committed Apr 14, 2026
commit 83051999ddd2bc5c219bb8c0d889f1d98b00d389
12 changes: 6 additions & 6 deletions deps/libffi/libffi.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@
],
'include_dirs': [
'include',
'<(INTERMEDIATE_DIR)',
'<(SHARED_INTERMEDIATE_DIR)/libffi',
],
'sources': [
'<@(libffi_sources)',
Expand All @@ -124,15 +124,15 @@
'src/x86/ffitarget.h',
],
'outputs': [
'<(INTERMEDIATE_DIR)/ffi.h',
'<(INTERMEDIATE_DIR)/fficonfig.h',
'<(INTERMEDIATE_DIR)/ffitarget.h',
'<(SHARED_INTERMEDIATE_DIR)/libffi/ffi.h',
'<(SHARED_INTERMEDIATE_DIR)/libffi/fficonfig.h',
'<(SHARED_INTERMEDIATE_DIR)/libffi/ffitarget.h',
],
'action': [
'<(python)',
'generate-headers.py',
'--output-dir',
'<(INTERMEDIATE_DIR)',
'<(SHARED_INTERMEDIATE_DIR)/libffi',
],
},
],
Expand Down Expand Up @@ -213,7 +213,7 @@
'direct_dependent_settings': {
'include_dirs': [
'include',
'<(INTERMEDIATE_DIR)',
'<(SHARED_INTERMEDIATE_DIR)/libffi',
],
'defines': [
'FFI_STATIC_BUILD',
Expand Down
30 changes: 0 additions & 30 deletions node.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1010,21 +1010,6 @@
'dependencies': [
'deps/libffi/libffi.gyp:libffi',
],
'conditions': [
[ 'OS=="win"', {
'include_dirs': [
'<(PRODUCT_DIR)/obj/libffi',
],
}, 'OS=="mac"', {
'include_dirs': [
'<(PRODUCT_DIR)/obj/deps/libffi/libffi.gen',
],
}, {
'include_dirs': [
'<(PRODUCT_DIR)/obj.target/libffi/geni',
],
}],
],
}],
],
}],
Expand Down Expand Up @@ -1092,21 +1077,6 @@
'dependencies': [
'deps/libffi/libffi.gyp:libffi',
],
'conditions': [
[ 'OS=="win"', {
'include_dirs': [
'<(PRODUCT_DIR)/obj/libffi',
],
}, 'OS=="mac"', {
'include_dirs': [
'<(PRODUCT_DIR)/obj/deps/libffi/libffi.gen',
],
}, {
'include_dirs': [
'<(PRODUCT_DIR)/obj.target/libffi/geni',
],
}],
],
}],
],
}],
Expand Down
Loading