summaryrefslogtreecommitdiff
path: root/tools/install.py
diff options
context:
space:
mode:
authorStewart Addison <sxa@uk.ibm.com>2016-07-12 19:04:29 +0100
committerMichael Dawson <michael_dawson@ca.ibm.com>2016-08-09 11:55:01 -0400
commita7222052d4e4cc4d46cf22e5a33c4f6a18c2d7bf (patch)
treeaec09a1838d952a43dba90328aaba69d98ebdfef /tools/install.py
parente03a7b2a2b3f092338004a28d07971f4104e9da9 (diff)
downloadnode-new-a7222052d4e4cc4d46cf22e5a33c4f6a18c2d7bf.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>
Diffstat (limited to 'tools/install.py')
-rwxr-xr-xtools/install.py9
1 files changed, 5 insertions, 4 deletions
diff --git a/tools/install.py b/tools/install.py
index a3986c5033..4f155376ea 100755
--- a/tools/install.py
+++ b/tools/install.py
@@ -118,10 +118,11 @@ def files(action):
if is_windows:
output_file += '.dll'
else:
- # GYP will output to lib.target, this is hardcoded in its source,
- # see the _InstallableTargetInstallPath function.
- output_prefix += 'lib.target/'
- output_file = 'lib' + output_file + '.so.' + get_version()
+ output_file = 'lib' + output_file + '.' + variables.get('shlib_suffix')
+ # GYP will output to lib.target except on OS X, this is hardcoded
+ # in its source - see the _InstallableTargetInstallPath function.
+ if sys.platform != 'darwin':
+ output_prefix += 'lib.target/'
action([output_prefix + output_file], 'bin/' + output_file)