Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit d8f97e6

Browse filesBrowse files
ShogunPandaaduh95
ShogunPanda
authored and
aduh95
committed
build: fix ffi dependency compilation
Signed-off-by: Paolo Insogna <paolo@cowtech.it> PR-URL: #62731 Reviewed-By: Bryan English <bryan@bryanenglish.com> Reviewed-By: Filip Skokan <panva.ip@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com> Reviewed-By: Chemi Atlow <chemi@atlow.co.il>
1 parent 349c750 commit d8f97e6
Copy full SHA for d8f97e6

2 files changed

+15-32Lines changed: 15 additions & 32 deletions

File tree

Expand file treeCollapse file tree
Open diff view settings
Filter options
Expand file treeCollapse file tree
Open diff view settings
Collapse file

‎deps/libffi/libffi.gyp‎

Copy file name to clipboardExpand all lines: deps/libffi/libffi.gyp
+15-10Lines changed: 15 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@
9696
{
9797
'target_name': 'libffi',
9898
'type': 'static_library',
99+
'hard_dependency': 1,
99100
'cflags': ['-fvisibility=hidden'],
100101
'xcode_settings': {
101102
'GCC_SYMBOLS_PRIVATE_EXTERN': 'YES',
@@ -106,7 +107,7 @@
106107
],
107108
'include_dirs': [
108109
'include',
109-
'<(INTERMEDIATE_DIR)',
110+
'<(SHARED_INTERMEDIATE_DIR)/libffi',
110111
],
111112
'sources': [
112113
'<@(libffi_sources)',
@@ -123,15 +124,15 @@
123124
'src/x86/ffitarget.h',
124125
],
125126
'outputs': [
126-
'<(INTERMEDIATE_DIR)/ffi.h',
127-
'<(INTERMEDIATE_DIR)/fficonfig.h',
128-
'<(INTERMEDIATE_DIR)/ffitarget.h',
127+
'<(SHARED_INTERMEDIATE_DIR)/libffi/ffi.h',
128+
'<(SHARED_INTERMEDIATE_DIR)/libffi/fficonfig.h',
129+
'<(SHARED_INTERMEDIATE_DIR)/libffi/ffitarget.h',
129130
],
130131
'action': [
131132
'<(python)',
132133
'generate-headers.py',
133134
'--output-dir',
134-
'<(INTERMEDIATE_DIR)',
135+
'<(SHARED_INTERMEDIATE_DIR)/libffi',
135136
],
136137
},
137138
],
@@ -146,8 +147,8 @@
146147
'include/ffi_cfi.h',
147148
'src/x86/asmnames.h',
148149
'src/x86/win64_intel.S',
149-
'<(INTERMEDIATE_DIR)/ffi.h',
150-
'<(INTERMEDIATE_DIR)/fficonfig.h',
150+
'<(SHARED_INTERMEDIATE_DIR)/libffi/ffi.h',
151+
'<(SHARED_INTERMEDIATE_DIR)/libffi/fficonfig.h',
151152
],
152153
'outputs': [
153154
'<(INTERMEDIATE_DIR)/win64_intel.asm',
@@ -163,6 +164,8 @@
163164
'include',
164165
'--include-dir',
165166
'src/x86',
167+
'--include-dir',
168+
'<(SHARED_INTERMEDIATE_DIR)/libffi',
166169
'--define',
167170
'FFI_STATIC_BUILD',
168171
],
@@ -183,8 +186,8 @@
183186
'include/ffi_cfi.h',
184187
'src/aarch64/internal.h',
185188
'src/aarch64/win64_armasm.S',
186-
'<(INTERMEDIATE_DIR)/ffi.h',
187-
'<(INTERMEDIATE_DIR)/fficonfig.h',
189+
'<(SHARED_INTERMEDIATE_DIR)/libffi/ffi.h',
190+
'<(SHARED_INTERMEDIATE_DIR)/libffi/fficonfig.h',
188191
],
189192
'outputs': [
190193
'<(INTERMEDIATE_DIR)/win64_armasm.obj',
@@ -200,6 +203,8 @@
200203
'include',
201204
'--include-dir',
202205
'src/aarch64',
206+
'--include-dir',
207+
'<(SHARED_INTERMEDIATE_DIR)/libffi',
203208
'--define',
204209
'FFI_STATIC_BUILD',
205210
'--assemble',
@@ -212,7 +217,7 @@
212217
'direct_dependent_settings': {
213218
'include_dirs': [
214219
'include',
215-
'<(INTERMEDIATE_DIR)',
220+
'<(SHARED_INTERMEDIATE_DIR)/libffi',
216221
],
217222
'defines': [
218223
'FFI_STATIC_BUILD',
Collapse file

‎node.gyp‎

Copy file name to clipboardExpand all lines: node.gyp
-22Lines changed: 0 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1010,17 +1010,6 @@
10101010
'dependencies': [
10111011
'deps/libffi/libffi.gyp:libffi',
10121012
],
1013-
'conditions': [
1014-
[ 'OS=="win"', {
1015-
'include_dirs': [
1016-
'<(PRODUCT_DIR)/obj/libffi',
1017-
],
1018-
}, {
1019-
'include_dirs': [
1020-
'<(PRODUCT_DIR)/obj.target/libffi/geni',
1021-
],
1022-
}],
1023-
],
10241013
}],
10251014
],
10261015
}],
@@ -1088,17 +1077,6 @@
10881077
'dependencies': [
10891078
'deps/libffi/libffi.gyp:libffi',
10901079
],
1091-
'conditions': [
1092-
[ 'OS=="win"', {
1093-
'include_dirs': [
1094-
'<(PRODUCT_DIR)/obj/libffi',
1095-
],
1096-
}, {
1097-
'include_dirs': [
1098-
'<(PRODUCT_DIR)/obj.target/libffi/geni',
1099-
],
1100-
}],
1101-
],
11021080
}],
11031081
],
11041082
}],

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.