Skip to content

Commit e1841b8

Browse files
committed
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.
1 parent 39bcff5 commit e1841b8

File tree

3 files changed

+3
-4
lines changed

3 files changed

+3
-4
lines changed

common.gypi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,8 +375,8 @@
375375
],
376376
}],
377377
[ 'OS in "linux freebsd openbsd solaris aix"', {
378-
'cflags': [ '-pthread'],
379-
'ldflags': [ '-pthread'],
378+
'cflags': [ '-pthread', ],
379+
'ldflags': [ '-pthread' ],
380380
}],
381381
[ 'OS in "linux freebsd openbsd solaris android aix"', {
382382
'cflags': [ '-Wall', '-Wextra', '-Wno-unused-parameter', ],

deps/openssl/openssl.gyp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@
174174
]
175175
}],
176176
['is_clang==1 or gcc_version>=43', {
177-
#'cflags': ['-Wno-error=unused-command-line-argument', '-Wno-error=parentheses-equality'],
177+
'cflags': ['-Wno-old-style-declaration'],
178178
}],
179179
['OS=="solaris"', {
180180
'defines': ['__EXTENSIONS__'],

node.gyp

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,6 @@
3131
'node_tag%': '',
3232
'node_release_urlbase%': '',
3333
'node_byteorder%': 'little',
34-
'python%': 'python',
3534
'icu_small%': 'false',
3635
'v8_postmortem_support%' : 'false',
3736
'V8_LIBBASE%': '<(PRODUCT_DIR)/../nw/obj/v8/libv8_libbase.a',

0 commit comments

Comments
 (0)