Skip to content

build: remove redundant intermediate node_aix_shared #63747

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
legendecas wants to merge 1 commit into
base: main
Choose a base branch
from
+19 −64
Open

build: remove redundant intermediate node_aix_shared #63747

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
83 changes: 19 additions & 64 deletions node.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,8 @@
'node_builtin_modules_path%': '',
# `node` executable target name.
'node_core_target_name%': 'node',
# Derived flag from `node_shared`.
# On most platforms, this is `static_library` if `node_shared` is false and `shared_library` if `node_shared` is true.
# AIX needs to generate static library first and then link to shared library `node_aix_shared`.
# TODO(legendecas): move this to depend on target `node_base` in AIX build .
'node_intermediate_lib_type%': 'static_library',
# `libnode` target type, `static_library` if `node_shared` is false and `shared_library` if `node_shared` is true.
'node_lib_type%': 'static_library',
# `libnode` target name, can be a `static_library` or `shared_library` based on `node_shared`.
# NOTE: Gyp will prefix this with `lib` if this name does not start with `lib`.
'node_lib_target_name%': 'libnode',
Expand Down Expand Up @@ -503,17 +500,7 @@
}],
[ 'node_shared=="true"', {
'node_target_type%': 'shared_library',
'conditions': [
['OS in "aix os400"', {
# For AIX, always generate static library first,
# It needs an extra step to generate exp and
# then use both static lib and exp to create
# shared lib.
'node_intermediate_lib_type': 'static_library',
}, {
'node_intermediate_lib_type': 'shared_library',
}],
],
'node_lib_type': 'shared_library',
}, {
'node_target_type%': 'executable',
}],
Expand Down Expand Up @@ -625,6 +612,10 @@
'src/node_main.cc'
],

'dependencies': [
'<(node_lib_target_name)',
],

'msvs_settings': {
'VCLinkerTool': {
'GenerateMapFile': 'true', # /MAP
Expand Down Expand Up @@ -657,25 +648,13 @@
'WARNING_CFLAGS': [ '-Werror' ],
},
}],
[ 'node_intermediate_lib_type=="static_library" and '
'node_shared=="true" and OS in "aix os400"', {
# For AIX, shared lib is linked by static lib and .exp. In the
# case here, the executable needs to link to shared lib.
# Therefore, use 'node_aix_shared' target to generate the
# shared lib and then executable.
'dependencies': [ 'node_aix_shared' ],
}, {
'dependencies': [ '<(node_lib_target_name)' ],
'conditions': [
['OS=="win" and node_shared=="true"', {
'dependencies': ['generate_node_def'],
'msvs_settings': {
'VCLinkerTool': {
'ModuleDefinitionFile': '<(PRODUCT_DIR)/<(node_core_target_name).def',
},
},
}],
],
['node_shared=="true" and OS=="win"', {
'dependencies': ['generate_node_def'],
'msvs_settings': {
'VCLinkerTool': {
'ModuleDefinitionFile': '<(PRODUCT_DIR)/<(node_core_target_name).def',
},
},
}],
[ 'node_shared=="false"', {
# Keep this whole-archive section in sync with the `node_lib` target below.
Expand Down Expand Up @@ -1114,7 +1093,7 @@
}, # node_base
{
'target_name': '<(node_lib_target_name)',
'type': '<(node_intermediate_lib_type)',
'type': '<(node_lib_type)',
'includes': [
'node.gypi',
],
Expand Down Expand Up @@ -1234,7 +1213,10 @@
},
}],
['node_shared=="true" and OS in "aix os400"', {
'product_name': 'node_base',
'ldflags': ['--shared'],
'direct_dependent_settings': {
'ldflags': [ '-Wl,-brtl' ],
},
}],
[ 'node_shared=="true" and OS=="win"', {
'sources': [
Expand Down Expand Up @@ -1816,33 +1798,6 @@
], # end targets

'conditions': [
['OS in "aix os400" and node_shared=="true"', {
'targets': [
{
'target_name': 'node_aix_shared',
'type': 'shared_library',
'product_name': '<(node_core_target_name)',
'ldflags': ['--shared'],
'product_extension': '<(shlib_suffix)',
'includes': [
'node.gypi'
],
'dependencies': ['<(node_lib_target_name)'],
'include_dirs': [
'src',
'deps/v8/include',
],
'sources': [
'<@(library_files)',
'<@(deps_files)',
'common.gypi',
],
'direct_dependent_settings': {
'ldflags': [ '-Wl,-brtl' ],
},
},
]
}], # end aix section
['OS=="win" and node_shared=="true"', {
'targets': [
{
Expand Down
Loading