diff options
| author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:43:26 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2016-06-02 10:44:03 +0200 |
| commit | bb91a70e24ac49fd21c1d7c8c91a216961da1e2d (patch) | |
| tree | 4c2497e0b093c7b0a25d48e72659dca21a50569a /chromium/v8/tools/tickprocessor.js | |
| parent | 1ec92e71bb67445775ce64cb081ed25c3d7481f1 (diff) | |
| parent | b92421879c003a0857b2074f7e05b3bbbb326569 (diff) | |
| download | qtwebengine-chromium-bb91a70e24ac49fd21c1d7c8c91a216961da1e2d.tar.gz | |
Merge branch 'upstream-master' into 51-based
Change-Id: I08d36e04494c3bb0c04641ad7c8e53bf418975db
Diffstat (limited to 'chromium/v8/tools/tickprocessor.js')
| -rw-r--r-- | chromium/v8/tools/tickprocessor.js | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/chromium/v8/tools/tickprocessor.js b/chromium/v8/tools/tickprocessor.js index 7d07bf6c558..ba7401a2236 100644 --- a/chromium/v8/tools/tickprocessor.js +++ b/chromium/v8/tools/tickprocessor.js @@ -670,8 +670,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 = ''; |