aboutsummaryrefslogtreecommitdiff
path: root/deps/v8/gypfiles/gyp_v8
diff options
context:
space:
mode:
authorMyles Borins <mylesborins@google.com>2018-04-10 21:39:51 -0400
committerMyles Borins <mylesborins@google.com>2018-04-11 13:22:42 -0400
commit12a1b9b8049462e47181a298120243dc83e81c55 (patch)
tree8605276308c8b4e3597516961266bae1af57557a /deps/v8/gypfiles/gyp_v8
parent78cd8263354705b767ef8c6a651740efe4931ba0 (diff)
downloadandroid-node-v8-12a1b9b8049462e47181a298120243dc83e81c55.tar.gz
android-node-v8-12a1b9b8049462e47181a298120243dc83e81c55.tar.bz2
android-node-v8-12a1b9b8049462e47181a298120243dc83e81c55.zip
deps: update V8 to 6.6.346.23
PR-URL: https://github.com/nodejs/node/pull/19201 Reviewed-By: Ali Ijaz Sheikh <ofrobots@google.com> Reviewed-By: Myles Borins <myles.borins@gmail.com> Reviewed-By: Matteo Collina <matteo.collina@gmail.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com>
Diffstat (limited to 'deps/v8/gypfiles/gyp_v8')
-rw-r--r--[-rwxr-xr-x]deps/v8/gypfiles/gyp_v818
1 files changed, 12 insertions, 6 deletions
diff --git a/deps/v8/gypfiles/gyp_v8 b/deps/v8/gypfiles/gyp_v8
index 5215f51352..62e13d86e6 100755..100644
--- a/deps/v8/gypfiles/gyp_v8
+++ b/deps/v8/gypfiles/gyp_v8
@@ -48,7 +48,8 @@ import gyp
# Add paths so that pymod_do_main(...) can import files.
sys.path.insert(
1, os.path.abspath(os.path.join(v8_root, 'tools', 'generate_shim_headers')))
-
+sys.path.append(
+ os.path.abspath(os.path.join(v8_root, 'third_party', 'binutils')))
def GetOutputDirectory():
"""Returns the output directory that GYP will use."""
@@ -108,14 +109,19 @@ def run_gyp(args):
if __name__ == '__main__':
args = sys.argv[1:]
- gyp_chromium_no_action = os.environ.get('GYP_CHROMIUM_NO_ACTION', '1')
- if gyp_chromium_no_action != '0':
- print 'GYP is now disabled by default.\n'
- print 'If you really want to run this, set the environment variable '
- print 'GYP_CHROMIUM_NO_ACTION=0.'
+ gyp_chromium_no_action = os.environ.get('GYP_CHROMIUM_NO_ACTION')
+ if gyp_chromium_no_action == '1':
+ print 'Skipping gyp_v8 due to GYP_CHROMIUM_NO_ACTION env var.'
sys.exit(0)
running_as_hook = '--running-as-hook'
+ if running_as_hook in args and gyp_chromium_no_action != '0':
+ print 'GYP is now disabled by default in runhooks.\n'
+ print 'If you really want to run this, either run '
+ print '`python gypfiles/gyp_v8` explicitly by hand '
+ print 'or set the environment variable GYP_CHROMIUM_NO_ACTION=0.'
+ sys.exit(0)
+
if running_as_hook in args:
args.remove(running_as_hook)