diff options
| author | kanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-12 16:01:28 +0000 |
|---|---|---|
| committer | kanemoto <kanemoto@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-11-12 16:01:28 +0000 |
| commit | dcad53d3bc3e4e716abfd63a813cecb496723923 (patch) | |
| tree | e41b13cfc52cb3438aa89c03fb8d14d30a1ba24f /common.mk | |
| parent | 9ca073576ca27c4af316720aa0aec2da2230c021 (diff) | |
merges r24482, r25061, r25124, r25126, r25552 from trunk into ruby_1_9_1.
These patches are for AIX compilation issues. This commit is allowed by
branch master (yugui). Thanks!
* ext/socket/extconf.rb : Compilation failure on AIX.
ss_len (a member of struct sockaddr_storage) has preceding __,
but ss_family does not have it from AIX 5.2.
* Makefile.in (miniruby): suppress duplication warning on AIX.
* common.mk (ruby.imp): add text section [Bug #2064].
* common.mk (ruby.imp): do not export Init_*.
* dln.c (aix_loaderror): fixed typo. suppress warnings.
* common.mk (ruby.imp): excluded prelude.o to get rid of circular
dependency. [ruby-dev:39052]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@25740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'common.mk')
| -rw-r--r-- | common.mk | 11 |
1 files changed, 7 insertions, 4 deletions
@@ -85,11 +85,12 @@ COMMONOBJS = array.$(OBJEXT) \ $(BUILTIN_TRANSOBJS) \ $(MISSING) -OBJS = dln.$(OBJEXT) \ +EXPORTOBJS = dln.$(OBJEXT) \ encoding.$(OBJEXT) \ - prelude.$(OBJEXT) \ $(COMMONOBJS) +OBJS = $(EXPORTOBJS) prelude.$(OBJEXT) + GOLFOBJS = goruby.$(OBJEXT) golf_prelude.$(OBJEXT) PRELUDE_SCRIPTS = $(srcdir)/prelude.rb $(srcdir)/enc/prelude.rb $(srcdir)/gem_prelude.rb @@ -160,8 +161,10 @@ $(STATIC_RUBY)$(EXEEXT): $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) @$(RM) $@ $(PURIFY) $(CC) $(MAINOBJ) $(DLDOBJS) $(EXTOBJS) $(LIBRUBY_A) $(MAINLIBS) $(EXTLIBS) $(LIBS) $(OUTFLAG)$@ $(LDFLAGS) $(XLDFLAGS) -ruby.imp: $(OBJS) - @$(NM) -Pgp $(OBJS) | awk 'BEGIN{print "#!"}; $$2~/^[BD]$$/{print $$1}' | sort -u -o $@ +ruby.imp: $(EXPORTOBJS) + @$(NM) -Pgp $(EXPORTOBJS) | \ + awk 'BEGIN{print "#!"}; $$2~/^[BDT]$$/&&$$1!~/^(Init_|\.)/{print $$1}' | \ + sort -u -o $@ install: install-nodoc $(RDOCTARGET) install-all: install-nodoc install-doc |