1berry/nodejs
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

build,deps: remove cygwin configuration which is not supported

Browse Source 
PR-URL: https://github.com/nodejs/node/pull/25931
Reviewed-By: João Reis <reis@janeasystems.com>
This commit is contained in:
Refael Ackermann 2019-02-03 16:09:36 -05:00
parent cd5c7bf240
commit 4698757610
1 changed files with 14 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
deps/v8/gypfiles/v8.gyp vendored
View File

@ -1935,12 +1935,9 @@
], ],
}], }],
['OS=="win"', { ['OS=="win"', {
'variables': {
'gyp_generators': '<!(echo $GYP_GENERATORS)',
},
'msvs_disabled_warnings': [4351, 4355, 4800], 'msvs_disabled_warnings': [4351, 4355, 4800],
'conditions': [ 'conditions': [
['node_use_pch!="true"', { ['node_use_pch != "true"', {
# When building Official, the .lib is too large and exceeds the 2G # When building Official, the .lib is too large and exceeds the 2G
# limit. This breaks it into multiple pieces to avoid the limit. # limit. This breaks it into multiple pieces to avoid the limit.
# See http://crbug.com/485155. # See http://crbug.com/485155.
@ -2248,50 +2245,20 @@
'defines': [ 'defines': [
'_CRT_RAND_S' # for rand_s() '_CRT_RAND_S' # for rand_s()
], ],
'variables': { 'sources': [
'gyp_generators': '<!(echo $GYP_GENERATORS)', '../src/base/debug/stack_trace_win.cc',
}, '../src/base/platform/platform-win32.cc',
'conditions': [ '../src/base/win32-headers.h',
['gyp_generators=="make"', {
'variables': {
'build_env': '<!(uname -o)',
},
'conditions': [
['build_env=="Cygwin"', {
'sources': [
'../src/base/debug/stack_trace_posix.cc',
'../src/base/platform/platform-cygwin.cc',
'../src/base/platform/platform-posix.cc',
'../src/base/platform/platform-posix.h',
],
}, {
'sources': [
'../src/base/debug/stack_trace_win.cc',
'../src/base/platform/platform-win32.cc',
'../src/base/win32-headers.h',
],
}],
],
'link_settings': {
'libraries': [ '-lwinmm', '-lws2_32' ],
},
}, {
'sources': [
'../src/base/debug/stack_trace_win.cc',
'../src/base/platform/platform-win32.cc',
'../src/base/win32-headers.h',
],
'msvs_disabled_warnings': [4351, 4355, 4800],
'link_settings': {
'libraries': [
'-ldbghelp.lib',
'-lshlwapi.lib',
'-lwinmm.lib',
'-lws2_32.lib'
],
},
}],
], ],
'msvs_disabled_warnings': [4351, 4355, 4800],
'link_settings': {
'libraries': [
'-ldbghelp.lib',
'-lshlwapi.lib',
'-lwinmm.lib',
'-lws2_32.lib'
],
},
}], }],
['OS=="qnx"', { ['OS=="qnx"', {
'link_settings': { 'link_settings': {