aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-13 11:44:50 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-10-13 11:44:50 +0000
commitf77d22d1fe8aeba960ff3516b6f605d728f47b14 (patch)
treeec046438177f593eb6f65656c53eaff6c436e605
parentcaa54c171522f46c26b3d5154f37730877df9df2 (diff)
downloadruby-f77d22d1fe8aeba960ff3516b6f605d728f47b14.tar.gz
common.mk: update-gems for older BASERUBY
* common.mk (update-gems): chdir to the target directory and then add the tool directory to load paths, for older BASERUBY. [Bug #10372][ruby-core:65630] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47904 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--common.mk4
2 files changed, 8 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 84f622d093..4b817a414d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Oct 13 20:44:49 2014 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (update-gems): chdir to the target directory and then
+ add the tool directory to load paths, for older BASERUBY.
+ [Bug #10372][ruby-core:65630]
+
Mon Oct 13 17:53:01 2014 SHIBATA Hiroshi <shibata.hiroshi@gmail.com>
* lib/xmlrpc/parser.rb: added new parser class using libxml-ruby gem.
diff --git a/common.mk b/common.mk
index ce5f830ea6..ce01aca00f 100644
--- a/common.mk
+++ b/common.mk
@@ -1082,8 +1082,8 @@ update-config_files: PHONY
update-gems: PHONY
$(ECHO) Downloading bundled gem files...
- $(Q) $(RUNRUBY) -I$(srcdir)/tool -rdownloader -answ \
- -C "$(srcdir)/gems" \
+ $(Q) $(RUNRUBY) -C "$(srcdir)/gems" \
+ -I../tool -rdownloader -answ \
-e 'gem, ver = *$$F' \
-e 'gem = "#{gem}-#{ver}.gem"' \
-e 'Downloader::RubyGems.download(gem)' \