From 3266411a8b17f1995071259a91ac5dfafb505d4f Mon Sep 17 00:00:00 2001 From: yugui Date: Sun, 19 Apr 2009 13:35:02 +0000 Subject: 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 at [ruby-talk:332282]. git-svn-id: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@23228 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 7 +++++++ common.mk | 4 ++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 9bf9a56b0..19b35b8b5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +Sat Mar 28 11:10:32 2009 Nobuyoshi Nakada + + * 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 a + [ruby-talk:332282]. + Fri Mar 27 01:33:37 2009 Tanaka Akira * time.c (time_cmp): negate the result of reverse comparison. diff --git a/common.mk b/common.mk index 1cc16ee50..0bdd7bd39 100644 --- a/common.mk +++ b/common.mk @@ -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 -- cgit