summaryrefslogtreecommitdiff
path: root/deps/uv/gyp_uv.py
diff options
context:
space:
mode:
authorcjihrig <cjihrig@gmail.com>2018-02-21 15:42:26 -0500
committercjihrig <cjihrig@gmail.com>2018-02-23 09:51:30 -0500
commit3a191229418dcc0e21956847993b1702c88a923b (patch)
tree23def7030d5bb38b47880a827d3e85576cac2008 /deps/uv/gyp_uv.py
parent3cef3e61d647d3dd2107087d876a3a02e0c3961e (diff)
downloadandroid-node-v8-3a191229418dcc0e21956847993b1702c88a923b.tar.gz
android-node-v8-3a191229418dcc0e21956847993b1702c88a923b.tar.bz2
android-node-v8-3a191229418dcc0e21956847993b1702c88a923b.zip
deps: upgrade libuv to 1.19.2
PR-URL: https://github.com/nodejs/node/pull/18918 Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl> Reviewed-By: Joyee Cheung <joyeec9h3@gmail.com>
Diffstat (limited to 'deps/uv/gyp_uv.py')
-rwxr-xr-xdeps/uv/gyp_uv.py23
1 files changed, 1 insertions, 22 deletions
diff --git a/deps/uv/gyp_uv.py b/deps/uv/gyp_uv.py
index bd37d95c47..c2add5caec 100755
--- a/deps/uv/gyp_uv.py
+++ b/deps/uv/gyp_uv.py
@@ -43,28 +43,7 @@ def run_gyp(args):
if __name__ == '__main__':
args = sys.argv[1:]
-
- # GYP bug.
- # On msvs it will crash if it gets an absolute path.
- # On Mac/make it will crash if it doesn't get an absolute path.
- if sys.platform == 'win32':
- args.append(os.path.join(uv_root, 'uv.gyp'))
- common_fn = os.path.join(uv_root, 'common.gypi')
- options_fn = os.path.join(uv_root, 'options.gypi')
- # we force vs 2010 over 2008 which would otherwise be the default for gyp
- if not os.environ.get('GYP_MSVS_VERSION'):
- os.environ['GYP_MSVS_VERSION'] = '2010'
- else:
- args.append(os.path.join(os.path.abspath(uv_root), 'uv.gyp'))
- common_fn = os.path.join(os.path.abspath(uv_root), 'common.gypi')
- options_fn = os.path.join(os.path.abspath(uv_root), 'options.gypi')
-
- if os.path.exists(common_fn):
- args.extend(['-I', common_fn])
-
- if os.path.exists(options_fn):
- args.extend(['-I', options_fn])
-
+ args.extend('-I common.gypi test/test.gyp'.split(' '))
args.append('--depth=' + uv_root)
# There's a bug with windows which doesn't allow this feature.