|
1 | 1 | { |
| 2 | + "variables": { |
| 3 | + "is_electron%": "<!(node ./utils/isBuildingForElectron.js <(node_root_dir))" |
| 4 | + }, |
| 5 | + |
2 | 6 | "conditions": [ |
3 | | - ["(OS=='win' and node_root_dir.split('\\\\')[-1].startswith('iojs')) or (OS=='mac' and node_root_dir.split('/')[-1].startswith('iojs'))", { |
| 7 | + ["(OS=='win' or OS=='mac') and <(is_electron) == 1", { |
4 | 8 | "conditions": [ |
5 | 9 | ["OS=='win'", { |
6 | 10 | "variables": { |
7 | | - "is_electron%": "1", |
8 | 11 | "openssl_include_dir%": "<(module_root_dir)\\vendor\\openssl" |
9 | 12 | } |
10 | 13 | }, { |
11 | 14 | "variables": { |
12 | | - "is_electron%": "1", |
13 | 15 | "openssl_include_dir%": "<(module_root_dir)/vendor/openssl" |
14 | 16 | } |
15 | 17 | }] |
|
18 | 20 | "conditions": [ |
19 | 21 | ["OS=='win'", { |
20 | 22 | "variables": { |
21 | | - "is_electron%": "0", |
22 | 23 | "openssl_include_dir%": "<(node_root_dir)\\include\\node" |
23 | 24 | } |
24 | 25 | }, { |
25 | 26 | "variables": { |
26 | | - "is_electron%": "0", |
27 | 27 | "openssl_include_dir%": "<(node_root_dir)/include/node" |
28 | 28 | } |
29 | 29 | }] |
|
35 | 35 | { |
36 | 36 | "target_name": "acquireOpenSSL", |
37 | 37 | "conditions": [ |
38 | | - ["<(is_electron) == 1", { |
| 38 | + ["<(is_electron) == 1 and OS != 'linux'", { |
39 | 39 | "actions": [{ |
40 | 40 | "action_name": "acquire", |
41 | 41 | "action": ["node", "utils/acquireOpenSSL.js"], |
|
121 | 121 | [ |
122 | 122 | "OS=='mac'", { |
123 | 123 | "conditions": [ |
124 | | - ["node_root_dir.split('/')[-1].startswith('iojs')", { |
| 124 | + ["<(is_electron) == 1", { |
125 | 125 | "include_dirs": [ |
126 | 126 | "vendor/openssl/include" |
127 | 127 | ], |
|
147 | 147 | [ |
148 | 148 | "OS=='win'", { |
149 | 149 | "conditions": [ |
150 | | - ["node_root_dir.split('\\\\')[-1].startswith('iojs')", { |
| 150 | + ["<(is_electron) == 1", { |
151 | 151 | "include_dirs": ["vendor/openssl/include"], |
152 | 152 | "libraries": [ |
153 | 153 | "<(module_root_dir)/vendor/openssl/lib/libcrypto.lib", |
|
185 | 185 | } |
186 | 186 | ], |
187 | 187 | [ |
188 | | - "OS=='linux' or OS.endswith('bsd')", { |
| 188 | + "OS.endswith('bsd') or (<(is_electron) == 1 and OS=='linux')", { |
189 | 189 | "libraries": [ |
190 | 190 | "-lcrypto", |
191 | 191 | "-lssl" |
|
0 commit comments