summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorYihong Wang <yh.wang@ibm.com>2017-12-04 16:07:53 -0800
committerJoyee Cheung <joyeec9h3@gmail.com>2018-01-17 11:34:28 +0800
commitf878f9414eb6c7ef1d166404ae43444826706db8 (patch)
treec5ff1021bb6d91ee6333003b572780dc834cd3a8 /configure
parentcd60c7db5fe04c6a53b7dd8784ad0b52af30958d (diff)
downloadandroid-node-v8-f878f9414eb6c7ef1d166404ae43444826706db8.tar.gz
android-node-v8-f878f9414eb6c7ef1d166404ae43444826706db8.tar.bz2
android-node-v8-f878f9414eb6c7ef1d166404ae43444826706db8.zip
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> Fixes: https://github.com/nodejs/node/issues/14158 PR-URL: https://github.com/nodejs/node/pull/17604 Reviewed-By: Bartosz Sosnowski <bartosz@janeasystems.com> Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Daniel Bevenius <daniel.bevenius@gmail.com>
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure9
1 files changed, 8 insertions, 1 deletions
diff --git a/configure b/configure
index a27af226dc..e0b0be6d11 100755
--- a/configure
+++ b/configure
@@ -878,7 +878,6 @@ def configure_node(o):
configure_mips(o)
if flavor == 'aix':
- o['variables']['node_core_target_name'] = 'node_base'
o['variables']['node_target_type'] = 'static_library'
if target_arch in ('x86', 'x64', 'ia32', 'x32'):
@@ -988,6 +987,13 @@ def configure_node(o):
else:
o['variables']['coverage'] = 'false'
+ if options.shared:
+ o['variables']['node_target_type'] = 'shared_library'
+ elif options.enable_static:
+ o['variables']['node_target_type'] = 'static_library'
+ else:
+ o['variables']['node_target_type'] = 'executable'
+
def configure_library(lib, output):
shared_lib = 'shared_' + lib
output['variables']['node_' + shared_lib] = b(getattr(options, shared_lib))
@@ -1488,6 +1494,7 @@ config = {
'BUILDTYPE': 'Debug' if options.debug else 'Release',
'USE_XCODE': str(int(options.use_xcode or 0)),
'PYTHON': sys.executable,
+ 'NODE_TARGET_TYPE': variables['node_target_type'],
}
if options.prefix: