Skip to content

Commit a11d506

Browse files
committed
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: #6179 Reviewed-By: James M Snell <[email protected]> Reviewed-By: Ben Noordhuis <[email protected]> Reviewed-By: Michaël Zasso <[email protected]>
1 parent d6e56fd commit a11d506

File tree

1 file changed

+4
-1
lines changed

1 file changed

+4
-1
lines changed

deps/v8/tools/tickprocessor.js

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -757,8 +757,11 @@ inherits(MacCppEntriesProvider, UnixCppEntriesProvider);
757757
MacCppEntriesProvider.prototype.loadSymbols = function(libName) {
758758
this.parsePos = 0;
759759
libName = this.targetRootFS + libName;
760+
761+
// It seems that in OS X `nm` thinks that `-f` is a format option, not a
762+
// "flat" display option flag.
760763
try {
761-
this.symbols = [os.system(this.nmExec, ['-n', '-f', libName], -1, -1), ''];
764+
this.symbols = [os.system(this.nmExec, ['-n', libName], -1, -1), ''];
762765
} catch (e) {
763766
// If the library cannot be found on this system let's not panic.
764767
this.symbols = '';

0 commit comments

Comments
 (0)