1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00

merges r20572 from trunk into ruby_1_9_1.

* Makefile.in (LIBRUBY_SO): localizes non-public symbols.

* configure.in (OBJDUMP, OBJCOPY): for dealing with binary files.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_1@20775 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
yugui 2008-12-16 03:45:03 +00:00
parent 5e369b4f31
commit 4f7723c02f
3 changed files with 14 additions and 1 deletions

View file

@ -1,3 +1,9 @@
Sun Dec 7 23:17:33 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* Makefile.in (LIBRUBY_SO): localizes non-public symbols.
* configure.in (OBJDUMP, OBJCOPY): for dealing with binary files.
Mon Dec 15 10:00:36 2008 Nobuyoshi Nakada <nobu@ruby-lang.org>
* common.mk (btest-ruby): use RUNRUBY instead of MINIRUBY to load the

View file

@ -102,6 +102,8 @@ AS = @AS@
ASFLAGS = @ASFLAGS@
IFCHANGE = $(srcdir)/tool/ifchange
SET_LC_MESSAGES = env LC_MESSAGES=C
OBJDUMP = @OBJDUMP@
OBJCOPY = @OBJCOPY@
OBJEXT = @OBJEXT@
ASMEXT = S
@ -137,6 +139,9 @@ $(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) "$$@" $@; }
@-$(MINIRUBY) -e 'ARGV.each{|link| File.delete link if File.exist? link; \
File.symlink "$(LIBRUBY_SO)", link}' \
$(LIBRUBY_ALIASES) || true

View file

@ -214,6 +214,9 @@ AC_CHECK_TOOL(AS, as)
ASFLAGS=$ASFLAGS
AC_SUBST(ASFLAGS)
AC_CHECK_TOOL(OBJDUMP, objdump)
AC_CHECK_TOOL(OBJCOPY, objcopy)
case "$target_os" in
cygwin*|mingw*)
AC_CHECK_TOOL(NM, nm)
@ -223,7 +226,6 @@ cygwin*|mingw*)
case "$target_os" in
mingw*)
test "$rb_cv_msvcrt" = "" && unset rb_cv_msvcrt
AC_CHECK_TOOL(OBJDUMP, objdump)
AC_CACHE_CHECK(for mingw32 runtime DLL, rb_cv_msvcrt, [
AC_TRY_LINK([#include <stdio.h>],
[FILE* volatile f = stdin; return 0;],