Skip to content
This repository was archived by the owner on Aug 31, 2021. It is now read-only.

Commit 2cd947d

Browse files
committed
[[ VS2015 ]] Ensure libopenssl builds under VS2015
This patch updates the libopenssl targets to use the new layout of prebuilts on Windows. In addition, it removes the dependence on a precomputed module definition file for revsecurity.dll, generating at build-time using a new mode of the weak symbol listing utility we have.
1 parent 2fd772e commit 2cd947d

1 file changed

Lines changed: 53 additions & 4 deletions

File tree

libopenssl/libopenssl.gyp

Lines changed: 53 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,9 +52,26 @@
5252
'openssl_api_compat%': '0x10100000L',
5353
},
5454

55-
'include_dirs':
55+
'conditions':
5656
[
57-
'../../prebuilt/include',
57+
[
58+
'OS == "win"',
59+
{
60+
'include_dirs':
61+
[
62+
'../../prebuilt/unpacked/openssl/<(target_arch)-win32-$(PlatformToolset)_static_$(ConfigurationName)/include',
63+
],
64+
},
65+
],
66+
[
67+
'OS != "win"',
68+
{
69+
'include_dirs':
70+
[
71+
'../../prebuilt/include',
72+
],
73+
},
74+
],
5875
],
5976

6077
'defines':
@@ -114,7 +131,7 @@
114131
'action_name': 'libopenssl_symbol_list',
115132
'inputs':
116133
[
117-
'../../util/list_stub_symbols.pl'
134+
'../../util/list_stub_symbols.pl',
118135
'ssl.stubs',
119136
],
120137
'outputs':
@@ -196,6 +213,8 @@
196213
'dependencies':
197214
[
198215
'../../prebuilt/libopenssl.gyp:libopenssl',
216+
'libopenssl_symbol_list_win',
217+
199218
],
200219

201220
'sources':
@@ -216,7 +235,7 @@
216235
{
217236
'VCLinkerTool':
218237
{
219-
'ModuleDefinitionFile': '$(ProjectDir)..\\..\\..\\..\\prebuilt\\lib\\win32\\x86\\revsecurity.def',
238+
'ModuleDefinitionFile': '<(SHARED_INTERMEDIATE_DIR)/src/revsecurity.def',
220239
'SubSystem': '1',
221240
},
222241

@@ -235,6 +254,36 @@
235254
},
236255
},
237256
},
257+
{
258+
'target_name': 'libopenssl_symbol_list_win',
259+
'type': 'none',
260+
261+
'actions':
262+
[
263+
{
264+
'action_name': 'libopenssl_symbol_list_win',
265+
'inputs':
266+
[
267+
'../../util/list_stub_symbols.pl',
268+
'ssl.stubs',
269+
],
270+
'outputs':
271+
[
272+
'<(SHARED_INTERMEDIATE_DIR)/src/revsecurity.def',
273+
],
274+
275+
'action':
276+
[
277+
'<@(perl)',
278+
'../../util/list_stub_symbols.pl',
279+
'',
280+
'ssl.stubs',
281+
'<@(_outputs)',
282+
'--exportdef=REVSECURITY',
283+
],
284+
},
285+
],
286+
},
238287
],
239288
}
240289
],

0 commit comments

Comments
 (0)