summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoe George <joe@zeroc.com>2021-02-11 15:49:38 -0500
committerJoe George <joe@zeroc.com>2021-02-11 15:50:38 -0500
commit3ac38645833a89f13b8e0121d1a91e0fc710fe5a (patch)
tree1f87b55f4badc245386b7176063b05c60dcce877
parentSwitch to using python3 by default (diff)
downloadice-3ac38645833a89f13b8e0121d1a91e0fc710fe5a.tar.bz2
ice-3ac38645833a89f13b8e0121d1a91e0fc710fe5a.tar.xz
ice-3ac38645833a89f13b8e0121d1a91e0fc710fe5a.zip
Support for Ruby 3.0 (Fixes #1257) (#1258)
-rw-r--r--ruby/config/Make.rules1
-rw-r--r--ruby/src/IceRuby/Config.h3
2 files changed, 4 insertions, 0 deletions
diff --git a/ruby/config/Make.rules b/ruby/config/Make.rules
index 8b7a493152e..db66418c3cc 100644
--- a/ruby/config/Make.rules
+++ b/ruby/config/Make.rules
@@ -14,6 +14,7 @@ RUBY ?= ruby
ruby-call = $(shell $(RUBY) -e 'require "rbconfig"; puts RbConfig::expand("$1")')
# Ruby compiler flags
+platform_cxx := $(call ruby-call, $$(CXX))
ruby_cppflags := -I$(call ruby-call,$$(rubyhdrdir))
ruby_config_dir := $(call ruby-call,$$(includedir)/$$(arch)/ruby-$$(ruby_version))
ruby_arch := $(call ruby-call,$$(arch))
diff --git a/ruby/src/IceRuby/Config.h b/ruby/src/IceRuby/Config.h
index 774d0601d1b..df22153fffc 100644
--- a/ruby/src/IceRuby/Config.h
+++ b/ruby/src/IceRuby/Config.h
@@ -57,6 +57,9 @@
// BUGFIX: Workaround clang conversion warnings in ruby headers
//
# pragma clang diagnostic ignored "-Wconversion"
+
+// Silence warnings regarding missing deprecation attributes in ruby headers
+# pragma clang diagnostic ignored "-Wdocumentation-deprecated-sync"
#elif defined(__GNUC__)
# pragma GCC diagnostic push
# pragma GCC diagnostic ignored "-Wunused-parameter"