aboutsummaryrefslogtreecommitdiffhomepage
path: root/build.yaml
diff options
context:
space:
mode:
authorGravatar ncteisen <ncteisen@gmail.com>2018-06-15 11:13:46 -0400
committerGravatar ncteisen <ncteisen@gmail.com>2018-06-15 11:13:46 -0400
commitc14e95fc63302421b71f0939a71d3a2b32c8ab1f (patch)
tree7a5a865423be974130cd24d3e70067052d6b9d8e /build.yaml
parentc7166ae67dd554d41b4d26286da2888aebc0153b (diff)
parentbd6ac0f9d57dda96797bbd5b1bd27815342e7ee5 (diff)
Merge branch 'master' of https://github.com/grpc/grpc into channelz
Diffstat (limited to 'build.yaml')
-rw-r--r--build.yaml6
1 files changed, 3 insertions, 3 deletions
diff --git a/build.yaml b/build.yaml
index adb61ab56f..2078ef5911 100644
--- a/build.yaml
+++ b/build.yaml
@@ -13,8 +13,8 @@ settings:
'#09': Per-language overrides are possible with (eg) ruby_version tag here
'#10': See the expand_version.py for all the quirks here
core_version: 6.0.0-dev
- g_stands_for: gloriosa
- version: 1.13.0-dev
+ g_stands_for: gladiolus
+ version: 1.14.0-dev
filegroups:
- name: alts_proto
headers:
@@ -5644,7 +5644,7 @@ defaults:
global:
COREFLAGS: -fno-rtti -fno-exceptions
CPPFLAGS: -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1
- -Wno-deprecated-declarations
+ -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT
LDFLAGS: -g
zlib:
CFLAGS: -Wno-sign-conversion -Wno-conversion -Wno-unused-value -Wno-implicit-function-declaration