[前][次][番号順一覧][スレッド一覧]

ruby-changes:19546

From: usa <ko1@a...>
Date: Mon, 16 May 2011 11:22:38 +0900 (JST)
Subject: [ruby-changes:19546] usa:r31587 (trunk): * configure.in, win32/Makefile.sub (RUBY_SO_NAME): add CPU as prefix

usa	2011-05-16 11:22:27 +0900 (Mon, 16 May 2011)

  New Revision: 31587

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=31587

  Log:
    * configure.in, win32/Makefile.sub (RUBY_SO_NAME): add CPU as prefix
      of RUBY_SO_NAME on x64/ia64 mswin/mingw.

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/win32/Makefile.sub

Index: configure.in
===================================================================
--- configure.in	(revision 31586)
+++ configure.in	(revision 31587)
@@ -2472,6 +2472,9 @@
 	    ],
 	[mingw*], [
 	    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
 		LIBRUBY_SO='$(RUBY_SO_NAME)'.dll
 		LIBRUBY_DLDFLAGS="${LIBRUBY_DLDFLAGS}"' $(RUBYDEF)'
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 31586)
+++ ChangeLog	(revision 31587)
@@ -1,3 +1,8 @@
+Mon May 16 11:21:09 2011  NAKAMURA Usaku  <usa@r...>
+
+	* 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@s...>
 
 	* lib/rdoc.rb:  Update to RDoc 3.6.1, allows OpenSSL::Digest to be
Index: win32/Makefile.sub
===================================================================
--- win32/Makefile.sub	(revision 31586)
+++ win32/Makefile.sub	(revision 31587)
@@ -130,7 +130,10 @@
 
 !ifndef RUBY_SO_NAME
 RUBY_SO_NAME = $(RT)-$(RUBY_BASE_NAME)$(MAJOR)$(MINOR)$(TEENY)
+!if "$(ARCH)" != "i386"
+RUBY_SO_NAME = $(ARCH)-$(RUBY_SO_NAME)
 !endif
+!endif
 !ifndef RUBY_PLATFORM
 RUBY_PLATFORM = $(arch)
 !endif

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/

[前][次][番号順一覧][スレッド一覧]