Commit be63c26
committed
build: don't add libraries when --enable-static
Currently when building with --enabled-static the cctest target will
include libraries to be linked regardless. This commit adds a condition
to only add the libraries when dynamically linking.
PR-URL: #14837
Fixes: #13500
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Refael Ackermann <refack@gmail.com>
Reviewed-By: James M Snell <jasnell@gmail.com>1 parent cd9f81d commit be63c26
1 file changed
Lines changed: 23 additions & 21 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -592,6 +592,26 @@ | |||
| 592 | 592 | 'OBJ_TRACING_PATH': '<(OBJ_DIR)/node/src/tracing', | |
| 593 | 593 | 'OBJ_SUFFIX': 'o', | |
| 594 | 594 | 'OBJ_SEPARATOR': '/', | |
| 595 | + 'OBJ_FILES': [ | ||
| 596 | + '<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)', | ||
| 597 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)', | ||
| 598 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)async-wrap.<(OBJ_SUFFIX)', | ||
| 599 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)', | ||
| 600 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)', | ||
| 601 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)', | ||
| 602 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)', | ||
| 603 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)', | ||
| 604 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)', | ||
| 605 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)', | ||
| 606 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)', | ||
| 607 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)', | ||
| 608 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)', | ||
| 609 | + '<(OBJ_PATH)<(OBJ_SEPARATOR)node_revert.<(OBJ_SUFFIX)', | ||
| 610 | + '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)', | ||
| 611 | + '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)', | ||
| 612 | + '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)', | ||
| 613 | + '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)', | ||
| 614 | + ], | ||
| 595 | 615 | 'conditions': [ | |
| 596 | 616 | ['OS=="win"', { | |
| 597 | 617 | 'OBJ_SUFFIX': 'obj', | |
@@ -631,27 +651,6 @@ | |||
| 631 | 651 | '<(SHARED_INTERMEDIATE_DIR)', # for node_natives.h | |
| 632 | 652 | ], | |
| 633 | 653 | ||
| 634 | - 'libraries': [ | ||
| 635 | - '<(OBJ_GEN_PATH)<(OBJ_SEPARATOR)node_javascript.<(OBJ_SUFFIX)', | ||
| 636 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_debug_options.<(OBJ_SUFFIX)', | ||
| 637 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)async-wrap.<(OBJ_SUFFIX)', | ||
| 638 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)env.<(OBJ_SUFFIX)', | ||
| 639 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node.<(OBJ_SUFFIX)', | ||
| 640 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_buffer.<(OBJ_SUFFIX)', | ||
| 641 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_i18n.<(OBJ_SUFFIX)', | ||
| 642 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_url.<(OBJ_SUFFIX)', | ||
| 643 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)util.<(OBJ_SUFFIX)', | ||
| 644 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)string_bytes.<(OBJ_SUFFIX)', | ||
| 645 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)string_search.<(OBJ_SUFFIX)', | ||
| 646 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)stream_base.<(OBJ_SUFFIX)', | ||
| 647 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_constants.<(OBJ_SUFFIX)', | ||
| 648 | - '<(OBJ_PATH)<(OBJ_SEPARATOR)node_revert.<(OBJ_SUFFIX)', | ||
| 649 | - '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)agent.<(OBJ_SUFFIX)', | ||
| 650 | - '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_buffer.<(OBJ_SUFFIX)', | ||
| 651 | - '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)node_trace_writer.<(OBJ_SUFFIX)', | ||
| 652 | - '<(OBJ_TRACING_PATH)<(OBJ_SEPARATOR)trace_event.<(OBJ_SUFFIX)', | ||
| 653 | - ], | ||
| 654 | - | ||
| 655 | 654 | 'defines': [ 'NODE_WANT_INTERNALS=1' ], | |
| 656 | 655 | ||
| 657 | 656 | 'sources': [ | |
@@ -666,6 +665,9 @@ | |||
| 666 | 665 | ], | |
| 667 | 666 | ||
| 668 | 667 | 'conditions': [ | |
| 668 | + ['node_target_type!="static_library"', { | ||
| 669 | + 'libraries': [ '<@(OBJ_FILES)' ], | ||
| 670 | + }], | ||
| 669 | 671 | ['v8_enable_inspector==1', { | |
| 670 | 672 | 'sources': [ | |
| 671 | 673 | 'test/cctest/test_inspector_socket.cc', | |
0 commit comments