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 | 8371969dc57d3451b378c05cb2e08b8b98ec1fbc (patch) | |
| tree | e41b13cfc52cb3438aa89c03fb8d14d30a1ba24f /Makefile.in | |
| parent | ccb7eb0659ce75b53f6233f4e78eb4d0ea93acab (diff) | |
| download | ruby-8371969dc57d3451b378c05cb2e08b8b98ec1fbc.tar.gz ruby-8371969dc57d3451b378c05cb2e08b8b98ec1fbc.tar.xz ruby-8371969dc57d3451b378c05cb2e08b8b98ec1fbc.zip | |
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: http://svn.ruby-lang.org/repos/ruby/branches/ruby_1_9_1@25740 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in index 9f6bb7b29..c0a9fe55d 100644 --- a/Makefile.in +++ b/Makefile.in @@ -134,7 +134,7 @@ all: miniruby$(EXEEXT): @-if test -f $@; then mv -f $@ $@.old; $(RM) $@.old; fi - $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@ + $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(LIBS) $(OUTFLAG)$@ $(PROGRAM): @$(RM) $@ |