diff options
| author |  Adam Cozzette <acozzette@gmail.com> | 2018-06-25 15:52:29 -0700 |
|---|---|---|
| committer |  GitHub <noreply@github.com> | 2018-06-25 15:52:29 -0700 |
| commit | d6f346b4d55ae5112934297593ec1c56c3d178a5 (patch) | |
| tree | 021b5476160e465a20ef7d4ae4c0524351667233 /ruby | |
| parent | 3d603f481ed142d0be5e8e4dd6d1cb4457a51405 (diff) | |
| parent | 82d3d7d250645322f8a7343188e5ae6246a76414 (diff) | |
Merge pull request #4827 from acozzette/merge-3-6-x
Merge 3.6.x branch into master
Diffstat (limited to 'ruby')
| -rw-r--r-- | ruby/ext/google/protobuf_c/extconf.rb | 4 | ||||
| -rw-r--r-- | ruby/google-protobuf.gemspec | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/ruby/ext/google/protobuf_c/extconf.rb b/ruby/ext/google/protobuf_c/extconf.rb index 0886e607..cc097e11 100644 --- a/ruby/ext/google/protobuf_c/extconf.rb +++ b/ruby/ext/google/protobuf_c/extconf.rb @@ -2,7 +2,9 @@ require 'mkmf' -$CFLAGS += " -std=c99 -O3 -DNDEBUG" +unless RUBY_PLATFORM =~ /mswin|mingw/ + $CFLAGS += " -std=c99 -O3 -DNDEBUG" +end if RUBY_PLATFORM =~ /linux/ diff --git a/ruby/google-protobuf.gemspec b/ruby/google-protobuf.gemspec index c09a7f24..cc7625d4 100644 --- a/ruby/google-protobuf.gemspec +++ b/ruby/google-protobuf.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = "google-protobuf" - s.version = "3.5.2" + s.version = "3.6.0" s.licenses = ["BSD-3-Clause"] s.summary = "Protocol Buffers" s.description = "Protocol Buffers are Google's data interchange format." |