Commit 3213de0
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -1,6 +1,7 @@ | |||
| 1 | 1 | { | |
| 2 | 2 | 'variables': { | |
| 3 | 3 | 'cargo_vendor_dir': './vendor', | |
| 4 | + 'node_crates_libpath': '<(SHARED_INTERMEDIATE_DIR)/>(cargo_build_mode)/<(STATIC_LIB_PREFIX)node_crates<(STATIC_LIB_SUFFIX)', | ||
| 4 | 5 | }, | |
| 5 | 6 | 'targets': [ | |
| 6 | 7 | { | |
@@ -14,7 +15,15 @@ | |||
| 14 | 15 | ], | |
| 15 | 16 | 'link_settings': { | |
| 16 | 17 | 'libraries': [ | |
| 17 | - '<(SHARED_INTERMEDIATE_DIR)/>(cargo_build_mode)/libnode_crates.a', | ||
| 18 | + '<(node_crates_libpath)', | ||
| 19 | + ], | ||
| 20 | + 'conditions': [ | ||
| 21 | + ['OS=="win"', { | ||
| 22 | + 'libraries': [ | ||
| 23 | + '-lntdll', | ||
| 24 | + '-luserenv' | ||
| 25 | + ], | ||
| 26 | + }], | ||
| 18 | 27 | ], | |
| 19 | 28 | }, | |
| 20 | 29 | 'actions': [ | |
@@ -24,7 +33,7 @@ | |||
| 24 | 33 | '<@(_sources)' | |
| 25 | 34 | ], | |
| 26 | 35 | 'outputs': [ | |
| 27 | - '<(SHARED_INTERMEDIATE_DIR)/>(cargo_build_mode)/libnode_crates.a' | ||
| 36 | + '<(node_crates_libpath)' | ||
| 28 | 37 | ], | |
| 29 | 38 | 'action': [ | |
| 30 | 39 | 'cargo', | |
0 commit comments