diff options
| author | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 11:08:44 +0000 |
|---|---|---|
| committer | yugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-01-28 11:08:44 +0000 |
| commit | 05392588e83e85b91549fad1fb00408497b8c019 (patch) | |
| tree | 9547da7e3ae749bf6a74c8094d948c153aa33422 /Makefile.in | |
| parent | b82c3200a111ca4a5092b6e754ccc23467921323 (diff) | |
merges r21685 from trunk into ruby_1_9_1.
* Makefile.in (miniruby): renames and then removes, to get rid of
EPERM on cygwin and mingw.
* Makefile.in ($(LIBRUBY_SO)): use wildcard option of objcopy.
* configure.in (DLDFLAGS): do not export all symbols.
* cygwin/GNUmakefile.in (RUBYDEF): rejects symbols prefixex with
Init_.
* win32/mkexports.rb (Exports::Mingw): includes all symbols except for
prefixed with Init_ as well as mswin32.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@21843 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Makefile.in b/Makefile.in index f4a4f785db..df308004a2 100644 --- a/Makefile.in +++ b/Makefile.in @@ -125,7 +125,7 @@ all: .NOEXPORT: miniruby$(EXEEXT): - @$(RM) $@ + @-if test -f $@; then mv -f $@ $@.old; $(RM) $@.old; fi $(PURIFY) $(CC) $(LDFLAGS) $(XLDFLAGS) $(MAINLIBS) $(MAINOBJ) $(MINIOBJS) $(COMMONOBJS) $(DMYEXT) $(ARCHFILE) $(LIBS) $(OUTFLAG)$@ $(PROGRAM): @@ -143,9 +143,7 @@ $(LIBRUBY_A): $(LIBRUBY_SO): @-$(PRE_LIBRUBY_UPDATE) $(LDSHARED) $(DLDFLAGS) $(OBJS) $(DLDOBJS) $(SOLIBS) $(OUTFLAG)$@ - @-test "$(OBJDUMP)" = "" || test "$(OBJCOPY)" = "" || { \ - set dummy `$(OBJDUMP) -t $@ | sed '/^[^ ]* g/!d;s/.* //;/^\(Init_\|vm_\)/!d;s/^/-L /'`; \ - shift; test "$$#" = 0 || $(OBJCOPY) "$$@" $@; } + -$(OBJCOPY) -w -L '@EXPORT_PREFIX@Init_*' $@ @-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \ File.symlink "$(LIBRUBY_SO)", link}' \ $(LIBRUBY_ALIASES) || true |