Skip to content

Commit 6b4f75b

Browse files
authored
Merge pull request #107 from murgatroid99/v1.8.x_branch_update
Update v1.8.x branch to 1.8.0-pre2
2 parents 36eb23e + 74c6bd5 commit 6b4f75b

File tree

3 files changed

+5
-6
lines changed

3 files changed

+5
-6
lines changed

packages/grpc-native-core/binding.gyp

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@
6363
'-Wno-long-long',
6464
'-Wno-unused-parameter',
6565
'-DOSATOMIC_USE_INLINED=1',
66-
'-Ithird_party/abseil-cpp',
6766
],
6867
'ldflags': [
6968
'-g',
@@ -186,7 +185,6 @@
186185
'-Wno-long-long',
187186
'-Wno-unused-parameter',
188187
'-DOSATOMIC_USE_INLINED=1',
189-
'-Ithird_party/abseil-cpp',
190188
],
191189
'OTHER_CPLUSPLUSFLAGS': [
192190
'-g',
@@ -196,7 +194,6 @@
196194
'-Wno-long-long',
197195
'-Wno-unused-parameter',
198196
'-DOSATOMIC_USE_INLINED=1',
199-
'-Ithird_party/abseil-cpp',
200197
'-stdlib=libc++',
201198
'-std=c++11',
202199
'-Wno-error=deprecated-declarations'
@@ -615,6 +612,7 @@
615612
'deps/grpc/src/core/lib/support/env_linux.cc',
616613
'deps/grpc/src/core/lib/support/env_posix.cc',
617614
'deps/grpc/src/core/lib/support/env_windows.cc',
615+
'deps/grpc/src/core/lib/support/fork.cc',
618616
'deps/grpc/src/core/lib/support/histogram.cc',
619617
'deps/grpc/src/core/lib/support/host_port.cc',
620618
'deps/grpc/src/core/lib/support/log.cc',
@@ -624,7 +622,6 @@
624622
'deps/grpc/src/core/lib/support/log_windows.cc',
625623
'deps/grpc/src/core/lib/support/mpscq.cc',
626624
'deps/grpc/src/core/lib/support/murmur_hash.cc',
627-
'deps/grpc/src/core/lib/support/stack_lockfree.cc',
628625
'deps/grpc/src/core/lib/support/string.cc',
629626
'deps/grpc/src/core/lib/support/string_posix.cc',
630627
'deps/grpc/src/core/lib/support/string_util_windows.cc',
@@ -697,6 +694,8 @@
697694
'deps/grpc/src/core/lib/iomgr/ev_windows.cc',
698695
'deps/grpc/src/core/lib/iomgr/exec_ctx.cc',
699696
'deps/grpc/src/core/lib/iomgr/executor.cc',
697+
'deps/grpc/src/core/lib/iomgr/fork_posix.cc',
698+
'deps/grpc/src/core/lib/iomgr/fork_windows.cc',
700699
'deps/grpc/src/core/lib/iomgr/gethostname_fallback.cc',
701700
'deps/grpc/src/core/lib/iomgr/gethostname_host_name_max.cc',
702701
'deps/grpc/src/core/lib/iomgr/gethostname_sysconf.cc',
Submodule grpc updated 382 files

packages/grpc-native-core/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"name": "grpc",
3-
"version": "1.8.0-dev",
3+
"version": "1.8.0-pre2",
44
"author": "Google Inc.",
55
"description": "gRPC Library for Node",
66
"homepage": "https://grpc.io/",

0 commit comments

Comments
 (0)