1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

deps: cherry-pick 1383d00 from v8 upstream

Browse Source 
Original commit message:

    tools: fix tickprocessor Cpp symbols on mac

    Despite man page documentation:

        -f Display the symbol table of a dynamic library flat (as one
           file not separate modules).

    `nm` on mac treats `-f` as a shorthand for `-format`. The `-f` argument
    does not seem to be required, so just remove it completely.

    (For `-format` documentation - see `nm --help` on mac).

    BUG=

    Review URL: https://codereview.chromium.org/1840633002

    Cr-Commit-Position: refs/heads/master@{#35445}

Fix: #5903
PR-URL: https://github.com/nodejs/node/pull/6179
Reviewed-By: James M Snell <jasnell@gmail.com>
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: Michaël Zasso <mic.besace@gmail.com>
This commit is contained in:
Fedor Indutny 2016-04-13 15:11:16 +02:00
parent d6e56fd843
commit a11d506dec
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
deps/v8/tools/tickprocessor.js vendored
View File

@ -757,8 +757,11 @@ inherits(MacCppEntriesProvider, UnixCppEntriesProvider);
MacCppEntriesProvider.prototype.loadSymbols = function(libName) { MacCppEntriesProvider.prototype.loadSymbols = function(libName) {
this.parsePos = 0; this.parsePos = 0;
libName = this.targetRootFS + libName; libName = this.targetRootFS + libName;
// It seems that in OS X `nm` thinks that `-f` is a format option, not a
// "flat" display option flag.
try { try {
this.symbols = [os.system(this.nmExec, ['-n', '-f', libName], -1, -1), '']; this.symbols = [os.system(this.nmExec, ['-n', libName], -1, -1), ''];
} catch (e) { } catch (e) {
// If the library cannot be found on this system let's not panic. // If the library cannot be found on this system let's not panic.
this.symbols = ''; this.symbols = '';