Commit 658dd40
build: refine static and shared lib build
Refine the static and shared lib build process in order
to integrate static and shared lib verfication into CI.
When building both static and shared lib, we still build
node executable now and it uses the shared and static lib.
Signed-off-by: Yihong Wang <yh.wang@ibm.com>
Refs: #14158
PR-URL: #17604
Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>1 parent e0d2842 commit 658dd40
5 files changed
Lines changed: 358 additions & 300 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -881,7 +881,6 @@ def configure_node(o): | |||
| 881 | 881 | configure_mips(o) | |
| 882 | 882 | ||
| 883 | 883 | if flavor == 'aix': | |
| 884 | - o['variables']['node_core_target_name'] = 'node_base' | ||
| 885 | 884 | o['variables']['node_target_type'] = 'static_library' | |
| 886 | 885 | ||
| 887 | 886 | if target_arch in ('x86', 'x64', 'ia32', 'x32'): | |
@@ -991,6 +990,13 @@ def configure_node(o): | |||
| 991 | 990 | else: | |
| 992 | 991 | o['variables']['coverage'] = 'false' | |
| 993 | 992 | ||
| 993 | + if options.shared: | ||
| 994 | + o['variables']['node_target_type'] = 'shared_library' | ||
| 995 | + elif options.enable_static: | ||
| 996 | + o['variables']['node_target_type'] = 'static_library' | ||
| 997 | + else: | ||
| 998 | + o['variables']['node_target_type'] = 'executable' | ||
| 999 | + | ||
| 994 | 1000 | def configure_library(lib, output): | |
| 995 | 1001 | shared_lib = 'shared_' + lib | |
| 996 | 1002 | output['variables']['node_' + shared_lib] = b(getattr(options, shared_lib)) | |
@@ -1487,8 +1493,7 @@ config = { | |||
| 1487 | 1493 | 'BUILDTYPE': 'Debug' if options.debug else 'Release', | |
| 1488 | 1494 | 'USE_XCODE': str(int(options.use_xcode or 0)), | |
| 1489 | 1495 | 'PYTHON': sys.executable, | |
| 1490 | - 'NODE_TARGET_TYPE': variables['node_target_type'] if options.enable_static \ | ||
| 1491 | - else '', | ||
| 1496 | + 'NODE_TARGET_TYPE': variables['node_target_type'], | ||
| 1492 | 1497 | } | |
| 1493 | 1498 | ||
| 1494 | 1499 | if options.prefix: | |
0 commit comments