summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorStewart Addison <sxa@uk.ibm.com>2016-07-12 19:04:29 +0100
committercjihrig <cjihrig@gmail.com>2016-08-10 13:01:54 -0400
commitb0a557eef79778e90b9eb694bd9d8af79f1b57b4 (patch)
treed174cb1da19d04763efa6f298e4d94ccf83a7a3a /configure
parent6ed4ea8fd667903061e864369c5581f7043289d4 (diff)
downloadnode-new-b0a557eef79778e90b9eb694bd9d8af79f1b57b4.tar.gz
build: add correct shared library naming on OS X
The build system currently creates a shared library on OS X with the same name as on Linux i.e. libnode.so.48. This is inconsistent with the conventions on OS X which uses libnode.48.so This commit changes the build process and install.py (used by make binary) to build with the correct name on OS X when the --shared configure parameter is used. PR-URL: https://github.com/nodejs/node/pull/7687 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Michael Dawson <michael_dawson@ca.ibm.com> Conflicts: node.gyp
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure6
1 files changed, 5 insertions, 1 deletions
diff --git a/configure b/configure
index b23bfc36a2..d930194196 100755
--- a/configure
+++ b/configure
@@ -840,7 +840,11 @@ def configure_node(o):
o['variables']['node_no_browser_globals'] = b(options.no_browser_globals)
o['variables']['node_shared'] = b(options.shared)
- o['variables']['node_module_version'] = int(getmoduleversion.get_version())
+ node_module_version = getmoduleversion.get_version()
+ shlib_suffix = '%s.dylib' if sys.platform == 'darwin' else 'so.%s'
+ shlib_suffix %= node_module_version
+ o['variables']['node_module_version'] = int(node_module_version)
+ o['variables']['shlib_suffix'] = shlib_suffix
if options.linked_module:
o['variables']['library_files'] = options.linked_module