aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-26 08:01:18 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2011-12-26 08:01:18 +0000
commitfb37a14aa258d817391d7ff6314c2baefce4d81c (patch)
tree164f6df1457dfa3f6e95bb80c1a8971c9b45c962
parent8f37f68c0df9e8edda88fc5b853081a3a3d1307c (diff)
downloadruby-fb37a14aa258d817391d7ff6314c2baefce4d81c.tar.gz
* common.mk (LIBRUBY_A): depends on main.o since r33774.
[ruby-core:41786] [Bug #5796] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@34131 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--common.mk2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 4fc88769ff..6d85f67e07 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Mon Dec 26 17:01:14 2011 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (LIBRUBY_A): depends on main.o since r33774.
+ [ruby-core:41786] [Bug #5796]
+
Mon Dec 26 13:07:08 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* test/ruby/test_io.rb (TestIO#test_autoclose): Tempfile.new doesn't
diff --git a/common.mk b/common.mk
index 748ad4264c..88a3552548 100644
--- a/common.mk
+++ b/common.mk
@@ -207,7 +207,7 @@ wprogram: showflags $(WPROGRAM)
$(PROGRAM): $(LIBRUBY) $(MAINOBJ) $(OBJS) $(EXTOBJS) $(SETUP) $(PREP)
-$(LIBRUBY_A): $(OBJS) $(DMYEXT) $(ARCHFILE)
+$(LIBRUBY_A): $(OBJS) $(MAINOBJ) $(DMYEXT) $(ARCHFILE)
$(LIBRUBY_SO): $(OBJS) $(DLDOBJS) $(LIBRUBY_A) $(PREP) $(LIBRUBY_SO_UPDATE) $(BUILTIN_ENCOBJS)