From e1841b8116b5783e50696e63fa033e9d5f86987a Mon Sep 17 00:00:00 2001 From: Jiajie Hu Date: Mon, 9 Oct 2017 10:00:17 +0800 Subject: [PATCH] Revert some GYP changes that no longer seem to be necessary for NW.js. Diff with upstream Node can be saved by a few lines with some random clean-up. --- common.gypi | 4 ++-- deps/openssl/openssl.gyp | 2 +- node.gyp | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/common.gypi b/common.gypi index d87cdb1056e..c46b89a41d4 100644 --- a/common.gypi +++ b/common.gypi @@ -375,8 +375,8 @@ ], }], [ 'OS in "linux freebsd openbsd solaris aix"', { - 'cflags': [ '-pthread'], - 'ldflags': [ '-pthread'], + 'cflags': [ '-pthread', ], + 'ldflags': [ '-pthread' ], }], [ 'OS in "linux freebsd openbsd solaris android aix"', { 'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ], diff --git a/deps/openssl/openssl.gyp b/deps/openssl/openssl.gyp index ef8b7401cbf..c2eb05a32cd 100644 --- a/deps/openssl/openssl.gyp +++ b/deps/openssl/openssl.gyp @@ -174,7 +174,7 @@ ] }], ['is_clang==1 or gcc_version>=43', { - #'cflags': ['-Wno-error=unused-command-line-argument', '-Wno-error=parentheses-equality'], + 'cflags': ['-Wno-old-style-declaration'], }], ['OS=="solaris"', { 'defines': ['__EXTENSIONS__'], diff --git a/node.gyp b/node.gyp index 3cb8a986ff2..30361c233a7 100644 --- a/node.gyp +++ b/node.gyp @@ -31,7 +31,6 @@ 'node_tag%': '', 'node_release_urlbase%': '', 'node_byteorder%': 'little', - 'python%': 'python', 'icu_small%': 'false', 'v8_postmortem_support%' : 'false', 'V8_LIBBASE%': '<(PRODUCT_DIR)/../nw/obj/v8/libv8_libbase.a',