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

* win32/setup.mak: support x86-amd64 cross compile environment.

Browse source 
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
usa 2011-07-12 02:59:11 +00:00
parent 2a5aa8cdaa
commit edeba4dbe6
2 changed files with 14 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
Tue Jul 12 11:58:28 2011 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/setup.mak: support x86-amd64 cross compile environment.
Mon Jul 11 23:22:28 2011 Yutaka Kanemoto <kanemoto@ruby-lang.org> Mon Jul 11 23:22:28 2011 Yutaka Kanemoto <kanemoto@ruby-lang.org>
* time.c: can't compile time.c on AIX due to missing declaration for * time.c: can't compile time.c on AIX due to missing declaration for

10
win32/setup.mak
View file

@ -204,6 +204,16 @@ RUBY_SO_NAME = $(RUBY_SO_NAME)
$(ARCH) = x64 $(ARCH) = x64
!elseif "$(PROCESSOR_ARCHITECTURE)" == "IA64" !elseif "$(PROCESSOR_ARCHITECTURE)" == "IA64"
$(ARCH) = ia64 $(ARCH) = ia64
!elseif defined(PROCESSOR_ARCHITEW6432)
$(BANG)if "$$(TARGET_OS)" == "mswin64"
!if "$(PROCESSOR_ARCHITECTURE)" == "IA64"
$(ARCH) = ia64
!else
$(ARCH) = x64
!endif
$(BANG)else
$(ARCH) = $(PROCESSOR_ARCHITECTURE)
$(BANG)endif
!else !else
$(ARCH) = $(PROCESSOR_ARCHITECTURE) $(ARCH) = $(PROCESSOR_ARCHITECTURE)
!endif !endif