kotovalexarian-likes-github
/
ruby--ruby
mirror of https://github.com/ruby/ruby.git
1
0
Fork 0
Code Releases Activity

* configure.in, win32/Makefile.sub (RUBY_SO_NAME): add CPU as prefix 

of RUBY_SO_NAME on x64/ia64 mswin/mingw.


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@31587 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2011-05-16 02:22:27 +00:00
parent f4b52722aa
commit ac3a3c05c9
3 changed files with 11 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ChangeLog
View File

@ -1,3 +1,8 @@
Mon May 16 11:21:09 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* configure.in, win32/Makefile.sub (RUBY_SO_NAME): add CPU as prefix
of RUBY_SO_NAME on x64/ia64 mswin/mingw.
Mon May 16 08:00:05 2011 Eric Hodel <drbrain@segment7.net> Mon May 16 08:00:05 2011 Eric Hodel <drbrain@segment7.net>
* lib/rdoc.rb: Update to RDoc 3.6.1, allows OpenSSL::Digest to be * lib/rdoc.rb: Update to RDoc 3.6.1, allows OpenSSL::Digest to be

3
configure.in
View File

@ -2472,6 +2472,9 @@ AS_CASE(["$target_os"],
], ],
[mingw*], [ [mingw*], [
RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}" RUBY_SO_NAME="${rb_cv_msvcrt}-${RUBY_SO_NAME}"
if test x"${target_cpu}" != xi386; then
RUBY_SO_NAME="${target_cpu}-${RUBY_SO_NAME}"
fi
if test x"$enable_shared" = xyes; then if test x"$enable_shared" = xyes; then
LIBRUBY_SO='$(RUBY_SO_NAME)'.dll LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)' LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'

3
win32/Makefile.sub
View File

@ -130,6 +130,9 @@ ruby_version = $(MAJOR).$(MINOR).$(TEENY)
!ifndef RUBY_SO_NAME !ifndef RUBY_SO_NAME
RUBY_SO_NAME = $(RT)-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)$(TEENY) RUBY_SO_NAME = $(RT)-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)$(TEENY)
!if "$(ARCH)" != "i386"
RUBY_SO_NAME = $(ARCH)-$(RUBY_SO_NAME)
!endif
!endif !endif
!ifndef RUBY_PLATFORM !ifndef RUBY_PLATFORM
RUBY_PLATFORM = $(arch) RUBY_PLATFORM = $(arch)