|
22 | 22 | 'node_v8_options%': '', |
23 | 23 | 'node_enable_v8_vtunejit%': 'false', |
24 | 24 | 'node_core_target_name%': 'node', |
25 | | - 'node_lib_target_name%': 'node_lib', |
| 25 | + 'node_lib_target_name%': 'libnode', |
26 | 26 | 'node_intermediate_lib_type%': 'static_library', |
27 | 27 | 'library_files': [ |
28 | 28 | 'lib/internal/bootstrap/environment.js', |
|
335 | 335 | 'msvs_settings': { |
336 | 336 | 'VCLinkerTool': { |
337 | 337 | 'AdditionalOptions': [ |
338 | | - '/WHOLEARCHIVE:<(node_core_target_name)<(STATIC_LIB_SUFFIX)', |
| 338 | + '/WHOLEARCHIVE:<(node_lib_target_name)<(STATIC_LIB_SUFFIX)', |
339 | 339 | ], |
340 | 340 | }, |
341 | 341 | }, |
|
364 | 364 | 'OTHER_LDFLAGS': [ '-Wl,-rpath,@loader_path', ], |
365 | 365 | }, |
366 | 366 | }], |
367 | | - [ 'node_intermediate_lib_type=="shared_library" and OS=="win"', { |
368 | | - # On Windows, having the same name for both executable and shared |
369 | | - # lib causes filename collision. Need a different PRODUCT_NAME for |
370 | | - # the executable and rename it back to node.exe later |
371 | | - 'product_name': '<(node_core_target_name)-win', |
372 | | - }], |
373 | 367 | [ 'node_report=="true"', { |
374 | 368 | 'defines': [ |
375 | 369 | 'NODE_REPORT', |
|
441 | 435 | { |
442 | 436 | 'target_name': '<(node_lib_target_name)', |
443 | 437 | 'type': '<(node_intermediate_lib_type)', |
444 | | - 'product_name': '<(node_core_target_name)', |
445 | 438 | 'includes': [ |
446 | | - 'node.gypi' |
| 439 | + 'node.gypi', |
447 | 440 | ], |
448 | 441 |
|
449 | 442 | 'include_dirs': [ |
|
1017 | 1010 | } ], |
1018 | 1011 | ] |
1019 | 1012 | }, # specialize_node_d |
1020 | | - { |
1021 | | - # When using shared lib to build executable in Windows, in order to avoid |
1022 | | - # filename collision, the executable name is node-win.exe. Need to rename |
1023 | | - # it back to node.exe |
1024 | | - 'target_name': 'rename_node_bin_win', |
1025 | | - 'type': 'none', |
1026 | | - 'dependencies': [ |
1027 | | - '<(node_core_target_name)', |
1028 | | - ], |
1029 | | - 'conditions': [ |
1030 | | - [ 'OS=="win" and node_intermediate_lib_type=="shared_library"', { |
1031 | | - 'actions': [ |
1032 | | - { |
1033 | | - 'action_name': 'rename_node_bin_win', |
1034 | | - 'inputs': [ |
1035 | | - '<(PRODUCT_DIR)/<(node_core_target_name)-win.exe' |
1036 | | - ], |
1037 | | - 'outputs': [ |
1038 | | - '<(PRODUCT_DIR)/<(node_core_target_name).exe', |
1039 | | - ], |
1040 | | - 'action': [ |
1041 | | - 'move', '<@(_inputs)', '<@(_outputs)', |
1042 | | - ], |
1043 | | - }, |
1044 | | - ], |
1045 | | - } ], |
1046 | | - ] |
1047 | | - }, # rename_node_bin_win |
1048 | 1013 | { |
1049 | 1014 | 'target_name': 'cctest', |
1050 | 1015 | 'type': 'executable', |
1051 | 1016 |
|
1052 | 1017 | 'dependencies': [ |
1053 | 1018 | '<(node_lib_target_name)', |
1054 | | - 'rename_node_bin_win', |
1055 | 1019 | 'deps/gtest/gtest.gyp:gtest', |
1056 | 1020 | 'deps/histogram/histogram.gyp:histogram', |
1057 | 1021 | 'node_dtrace_header', |
|
0 commit comments