summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRefael Ackermann <refack@gmail.com>2019-02-03 16:09:36 -0500
committerRefael Ackermann <refack@gmail.com>2019-02-14 15:14:43 -0500
commit469875761070bc64d405792e312f6f2f7ee1ed88 (patch)
treea17bd21ed7b572dcee653fa1c538fcd4b62f7ddd
parentcd5c7bf240f92d2a5007f1e0de1dfc76d54222fd (diff)
downloadandroid-node-v8-469875761070bc64d405792e312f6f2f7ee1ed88.tar.gz
android-node-v8-469875761070bc64d405792e312f6f2f7ee1ed88.tar.bz2
android-node-v8-469875761070bc64d405792e312f6f2f7ee1ed88.zip
build,deps: remove cygwin configuration which is not supported
PR-URL: https://github.com/nodejs/node/pull/25931 Reviewed-By: João Reis <reis@janeasystems.com>
-rw-r--r--deps/v8/gypfiles/v8.gyp61
1 files changed, 14 insertions, 47 deletions
diff --git a/deps/v8/gypfiles/v8.gyp b/deps/v8/gypfiles/v8.gyp
index 1c219fad50..de8fd92f7d 100644
--- a/deps/v8/gypfiles/v8.gyp
+++ b/deps/v8/gypfiles/v8.gyp
@@ -1935,12 +1935,9 @@
],
}],
['OS=="win"', {
- 'variables': {
- 'gyp_generators': '<!(echo $GYP_GENERATORS)',
- },
'msvs_disabled_warnings': [4351, 4355, 4800],
'conditions': [
- ['node_use_pch!="true"', {
+ ['node_use_pch != "true"', {
# When building Official, the .lib is too large and exceeds the 2G
# limit. This breaks it into multiple pieces to avoid the limit.
# See http://crbug.com/485155.
@@ -2248,50 +2245,20 @@
'defines': [
'_CRT_RAND_S' # for rand_s()
],
- 'variables': {
- 'gyp_generators': '<!(echo $GYP_GENERATORS)',
- },
- 'conditions': [
- ['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'
- ],
- },
- }],
+ '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'
+ ],
+ },
}],
['OS=="qnx"', {
'link_settings': {