diff options
| author |  ncteisen <ncteisen@gmail.com> | 2018-06-15 11:13:46 -0400 |
|---|---|---|
| committer | ncteisen <ncteisen@gmail.com> | 2018-06-15 11:13:46 -0400 |
| commit | c14e95fc63302421b71f0939a71d3a2b32c8ab1f (patch) | |
| tree | 7a5a865423be974130cd24d3e70067052d6b9d8e /Makefile | |
| parent | c7166ae67dd554d41b4d26286da2888aebc0153b (diff) | |
| parent | bd6ac0f9d57dda96797bbd5b1bd27815342e7ee5 (diff) | |
Merge branch 'master' of https://github.com/grpc/grpc into channelz
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 8 |
1 files changed, 3 insertions, 5 deletions
@@ -334,12 +334,10 @@ CXXFLAGS += -std=c++11 ifeq ($(SYSTEM),Darwin) CXXFLAGS += -stdlib=libc++ endif -CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations +CPPFLAGS += -g -Wall -Wextra -Werror -Wno-long-long -Wno-unused-parameter -DOSATOMIC_USE_INLINED=1 -Wno-deprecated-declarations -Ithird_party/nanopb -DPB_FIELD_32BIT COREFLAGS += -fno-rtti -fno-exceptions LDFLAGS += -g -DEFINES += PB_FIELD_16BIT - CPPFLAGS += $(CPPFLAGS_$(CONFIG)) CFLAGS += $(CFLAGS_$(CONFIG)) CXXFLAGS += $(CXXFLAGS_$(CONFIG)) @@ -421,8 +419,8 @@ Q = @ endif CORE_VERSION = 6.0.0-dev -CPP_VERSION = 1.13.0-dev -CSHARP_VERSION = 1.13.0-dev +CPP_VERSION = 1.14.0-dev +CSHARP_VERSION = 1.14.0-dev CPPFLAGS_NO_ARCH += $(addprefix -I, $(INCLUDES)) $(addprefix -D, $(DEFINES)) CPPFLAGS += $(CPPFLAGS_NO_ARCH) $(ARCH_FLAGS) |