diff options
author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-19 13:35:02 +0000 |
---|---|---|
committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-04-19 13:35:02 +0000 |
commit | f8063e378c2d198f20c2a47e1ecba97c6940409a (patch) | |
tree | 9fdbe8ce291346a01f128706b529f37c8be63533 | |
parent | 2f491ea20267b93ec6b491c26001d9f8e5bf7008 (diff) |
merges r23091 from trunk into ruby_1_9_1.
--
* 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/branches/ruby_1_9_1@23228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 7 | ||||
-rw-r--r-- | common.mk | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -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]. + Fri Mar 27 01:33:37 2009 Tanaka Akira <akr@fsij.org> * time.c (time_cmp): negate the result of reverse comparison. @@ -160,8 +160,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 |