From a4d67c95b6ddae9683e80c56fe06c9dfab1a33ce Mon Sep 17 00:00:00 2001 From: Vasili Skurydzin Date: Mon, 15 Oct 2018 16:44:38 -0400 Subject: [PATCH] deps: cherry-pick a51f429 from V8 upstream Original commit message: Use gn from PATH on aix Change-Id: I853f7899dbba9112ba1ca2ce78e2838b5a09c975 Reviewed-on: https://chromium-review.googlesource.com/1168087 Commit-Queue: John Barboza Reviewed-by: Michael Achenbach Cr-Commit-Position: refs/heads/master@{#55028} PR-URL: https://github.com/nodejs/node/pull/23695 Reviewed-By: Michael Dawson Reviewed-By: Refael Ackermann Reviewed-By: Yang Guo Reviewed-By: Ujjwal Sharma --- common.gypi | 2 +- deps/v8/tools/mb/mb.py | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/common.gypi b/common.gypi index 1a1bdb5f005a16..24702b7f62bdf5 100644 --- a/common.gypi +++ b/common.gypi @@ -33,7 +33,7 @@ # Reset this number to 0 on major V8 upgrades. # Increment by one for each non-official patch applied to deps/v8. - 'v8_embedder_string': '-node.40', + 'v8_embedder_string': '-node.41', # Enable disassembler for `--print-code` v8 options 'v8_enable_disassembler': 1, diff --git a/deps/v8/tools/mb/mb.py b/deps/v8/tools/mb/mb.py index 0c768886bf190b..cbb5b5dd6d5bd6 100755 --- a/deps/v8/tools/mb/mb.py +++ b/deps/v8/tools/mb/mb.py @@ -832,14 +832,12 @@ def GNCmd(self, subcommand, path, *args): subdir, exe = 'linux64', 'gn' elif self.platform == 'darwin': subdir, exe = 'mac', 'gn' - elif self.platform == 'aix6': - subdir, exe = 'aix', 'gn' else: subdir, exe = 'win', 'gn.exe' arch = platform.machine() - if (self.platform == 'linux2' and - (arch.startswith('s390') or arch.startswith('ppc'))): + if (arch.startswith('s390') or arch.startswith('ppc') or + self.platform.startswith('aix')): # use gn in PATH gn_path = 'gn' else: