diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-12 02:59:11 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2011-07-12 02:59:11 +0000 |
| commit | edeba4dbe6fac8e5693b8e5bff12f09a93d22999 (patch) | |
| tree | 6ea8dc83b6547071d26ab26f5d394035ff8cb036 /win32 | |
| parent | 2a5aa8cdaa3343b8b9af17c3cdb827d6bae59dcc (diff) | |
* win32/setup.mak: support x86-amd64 cross compile environment.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@32521 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/setup.mak | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/win32/setup.mak b/win32/setup.mak index 0733e99bbb..0d9990ae8e 100644 --- a/win32/setup.mak +++ b/win32/setup.mak @@ -204,6 +204,16 @@ RUBY_SO_NAME = $(RUBY_SO_NAME) $(ARCH) = x64 !elseif "$(PROCESSOR_ARCHITECTURE)" == "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 $(ARCH) = $(PROCESSOR_ARCHITECTURE) !endif |