diff --git a/test/common/shared-lib-util.js b/test/common/shared-lib-util.js index 9f891a6043ef3d..f40acd783ba0e7 100644 --- a/test/common/shared-lib-util.js +++ b/test/common/shared-lib-util.js @@ -17,11 +17,11 @@ function addLibraryPath(env) { env.LD_LIBRARY_PATH = (env.LD_LIBRARY_PATH ? env.LD_LIBRARY_PATH + path.delimiter : '') + - path.join(kExecPath, 'lib.target'); + kExecPath; // For AIX. env.LIBPATH = (env.LIBPATH ? env.LIBPATH + path.delimiter : '') + - path.join(kExecPath, 'lib.target'); + kExecPath; // For Mac OSX. env.DYLD_LIBRARY_PATH = (env.DYLD_LIBRARY_PATH ? env.DYLD_LIBRARY_PATH + path.delimiter : '') + @@ -34,10 +34,8 @@ function addLibraryPath(env) { function getSharedLibPath() { if (common.isWindows) { return path.join(kExecPath, 'node.dll'); - } else if (common.isOSX) { - return path.join(kExecPath, `libnode.${kShlibSuffix}`); } - return path.join(kExecPath, 'lib.target', `libnode.${kShlibSuffix}`); + return path.join(kExecPath, `libnode.${kShlibSuffix}`); } // Get the binary path of stack frames. diff --git a/tools/install.py b/tools/install.py index 655802980a6ea9..729b416fc47d3f 100755 --- a/tools/install.py +++ b/tools/install.py @@ -132,10 +132,6 @@ def files(action): output_file += '.dll' else: 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/' if 'false' == variables.get('node_shared'): action([output_prefix + output_file], 'bin/' + output_file)