aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-28 02:10:34 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-03-28 02:10:34 +0000
commitf4cecb53bd3e39c24e8b1445ae226a931ff9cb70 (patch)
treed9223b1b09404b86d145800b25d3cbacec2ef75b
parent48379c7309a0603186f6a450f73ea2178185589a (diff)
downloadruby-f4cecb53bd3e39c24e8b1445ae226a931ff9cb70.tar.gz
* common.mk (ruby.imp): all symbols in static library need to be
exported, so that encoding-extensions can be loaded. based on a patch from Yutaka Kanemoto <kinpoco AT gmail.com> at [ruby-talk:332282]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23091 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--common.mk4
2 files changed, 9 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8a6487cfd0..1eea0c3a79 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+Sat Mar 28 11:10:32 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * common.mk (ruby.imp): all symbols in static library need to be
+ exported, so that encoding-extensions can be loaded. based on a
+ patch from Yutaka Kanemoto <kinpoco AT gmail.com> a
+ [ruby-talk:332282].
+
Sat Mar 28 08:49:47 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* sprintf.c (rb_str_format): checks if named argument given twice.
diff --git a/common.mk b/common.mk
index 3aea9e1ab2..a97ec8b471 100644
--- a/common.mk
+++ b/common.mk
@@ -168,8 +168,8 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
@$(RM) $@
$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
-ruby.imp: $(COMMONOBJS)
- @$(NM) -Pgp $(COMMONOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+ruby.imp: $(OBJS)
+ @$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
install: install-nodoc $(RDOCTARGET)
install-all: install-nodoc install-doc install-capi