summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-26 08:17:30 +0000
committermrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-12-26 08:17:30 +0000
commit35b7af7503d380f220b5730d47b542ba295be37b (patch)
tree66faafd17695db72144ec79a193f09113d46d2bf
parent9b817107ce0fea9e4dcde6edf5664c734a2faa2b (diff)
Import bigdecimal 1.4.2
* https://github.com/ruby/bigdecimal/compare/v1.4.1..v1.4.2 git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@66574 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ext/bigdecimal/bigdecimal.gemspec2
-rw-r--r--ext/bigdecimal/util/extconf.rb6
2 files changed, 4 insertions, 4 deletions
diff --git a/ext/bigdecimal/bigdecimal.gemspec b/ext/bigdecimal/bigdecimal.gemspec
index 68d8f3c00f..c7a27fe1c3 100644
--- a/ext/bigdecimal/bigdecimal.gemspec
+++ b/ext/bigdecimal/bigdecimal.gemspec
@@ -1,6 +1,6 @@
# coding: utf-8
-bigdecimal_version = '1.4.1'
+bigdecimal_version = '1.4.2'
Gem::Specification.new do |s|
s.name = "bigdecimal"
diff --git a/ext/bigdecimal/util/extconf.rb b/ext/bigdecimal/util/extconf.rb
index 8750db1c52..b0d56358f8 100644
--- a/ext/bigdecimal/util/extconf.rb
+++ b/ext/bigdecimal/util/extconf.rb
@@ -4,11 +4,11 @@ require 'mkmf'
checking_for(checking_message("Windows")) do
case RUBY_PLATFORM
when /cygwin|mingw/
- if defined?($extlist)
- build_dir = "$(TARGET_SO_DIR)../"
- else
+ if ARGV.include?('-rdevkit') # check `rake -rdevkit compile` case
base_dir = File.expand_path('../../../..', __FILE__)
build_dir = File.join(base_dir, "tmp", RUBY_PLATFORM, "bigdecimal", RUBY_VERSION, "")
+ else
+ build_dir = "$(TARGET_SO_DIR)../"
end
$libs << " #{build_dir}bigdecimal.so"
true