summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-27 16:26:31 +0000
committerkanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-09-27 16:26:31 +0000
commit10806f146fbed2a5c2204abe8a08729af1cbf907 (patch)
tree0c2a2690a49fec1a5dea91d0e97bf901bdf84126
parent9278fab680e2bbbe9e443ad8ef2cec631800de2e (diff)
* common.mk (ruby.imp): add text section [Bug #2064].
* common.mk (ruby.imp): do not export Init_*. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@25124 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog6
-rw-r--r--common.mk4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 516bd71aa4..ba202ccb61 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Mon Sep 28 01:13:25 2009 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+
+ * common.mk (ruby.imp): add text section [Bug #2064].
+
+ * common.mk (ruby.imp): do not export Init_*.
+
Sun Sep 27 13:06:43 2009 Tanaka Akira <akr@fsij.org>
* lib/pp.rb (PP:ObjectMixin#pretty_print): delegates has no inspect
diff --git a/common.mk b/common.mk
index e154625605..d077ad1c2d 100644
--- a/common.mk
+++ b/common.mk
@@ -170,7 +170,9 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
ruby.imp: $(EXPORTOBJS)
- @$(NM) -Pgp $(EXPORTOBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@
+ @$(NM) -Pgp $(EXPORTOBJS) | \
+ awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|\.)/{print $$1}' | \
+ sort -u -o $@
install: install-$(INSTALLDOC)
docs: $(DOCTARGETS)