aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorkanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-08 11:33:59 +0000
committerkanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2013-12-08 11:33:59 +0000
commit91092927891c892b2c4c8fd6df4ac0d739470610 (patch)
treef45338a19f949c27fefdb5372c74c7ae55fe0a94
parentcf85aaf83e48c8e2492432673b7e0f88ed4c97a9 (diff)
downloadruby-91092927891c892b2c4c8fd6df4ac0d739470610.tar.gz
avoid circular dependency on AIX
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@44075 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--common.mk4
2 files changed, 6 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 24330215aa..81c1754c9d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Sun Dec 8 20:26:54 2013 Yutaka Kanemoto <kanemoto@ruby-lang.org>
+
+ * common.mk (ruby.imp): avoid circular dependency on AIX
+
Sun Dec 8 20:21:00 2013 Kenta Murata <mrkn@mrkn.jp>
* bigdecimal.c (BigDecimal_coerce): convert a Float to a BigDecimal instead
diff --git a/common.mk b/common.mk
index 76b5c54a3f..0c8b7fc54a 100644
--- a/common.mk
+++ b/common.mk
@@ -223,8 +223,8 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A)
$(Q)$(RM) $@
$(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS)
-ruby.imp: $(EXPORTOBJS)
- $(Q)$(NM) -Pgp $(EXPORTOBJS) | \
+ruby.imp: $(COMMONOBJS)
+ $(Q)$(NM) -Pgp $(COMMONOBJS) | \
awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|.*_threadptr_|\.)/{print $$1}' | \
sort -u -o $@