aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-18 12:24:28 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-03-18 12:24:28 +0000
commitbd5e925cc4580517e7fa08d46768cdb690598c3e (patch)
tree3569a5505350f020398b261467832d59fbfb3af6
parentf9d64323c8608646671923cdbb3f8870696556a4 (diff)
downloadruby-bd5e925cc4580517e7fa08d46768cdb690598c3e.tar.gz
* Makefile.in (miniruby): link $(NORMALMAINOBJ).
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@26974 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--Makefile.in2
2 files changed, 5 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index d546b10291..ea83f9a142 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Thu Mar 18 21:24:21 2010 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * Makefile.in (miniruby): link $(NORMALMAINOBJ).
+
Thu Mar 18 19:52:27 2010 Tanaka Akira <akr@fsij.org>
* tool/transcode-tblgen.rb: scan singleton mappings sequentially.
diff --git a/Makefile.in b/Makefile.in
index 4402e701c2..5bda7a6962 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -139,7 +139,7 @@ all:
miniruby$(EXEEXT):
@-if test -f $@; then $(MV) -f $@ $@.old; $(RM) $@.old; fi
- $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@
+ $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(NORMALMAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@
$(PROGRAM):
@$(RM) $@