diff options
author | Fedor Indutny <fedor@indutny.com> | 2016-04-13 15:11:16 +0200 |
---|---|---|
committer | Fedor Indutny <fedor@indutny.com> | 2016-04-13 19:57:01 +0200 |
commit | a11d506decd2820221d6cd770990a585ca0261d5 (patch) | |
tree | 40c971f05978aef4d7dcfec2436165d3844817ef /deps | |
parent | d6e56fd843895356769774aebe28b0206ea86d35 (diff) | |
download | node-new-a11d506decd2820221d6cd770990a585ca0261d5.tar.gz |
deps: cherry-pick 1383d00 from v8 upstream
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>
Diffstat (limited to 'deps')
-rw-r--r-- | deps/v8/tools/tickprocessor.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/deps/v8/tools/tickprocessor.js b/deps/v8/tools/tickprocessor.js index 600d2eeb7b..e62720bd8a 100644 --- a/deps/v8/tools/tickprocessor.js +++ b/deps/v8/tools/tickprocessor.js @@ -757,8 +757,11 @@ inherits(MacCppEntriesProvider, UnixCppEntriesProvider); MacCppEntriesProvider.prototype.loadSymbols = function(libName) { this.parsePos = 0; 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 { - this.symbols = [os.system(this.nmExec, ['-n', '-f', libName], -1, -1), '']; + this.symbols = [os.system(this.nmExec, ['-n', libName], -1, -1), '']; } catch (e) { // If the library cannot be found on this system let's not panic. this.symbols = ''; |