win32/setup.mak: get target architecture from the compiler

* win32/Makefile.sub, win32/setup.mak (MACHINE): get target
  architecture from the compiler, instead of environment variable
  at build time, which is irrelevant to runtime environment, and
  not set when running in cygwin sshd.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@48210 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

win32/Makefile.sub

@@ -86,11 +86,10 @@ BASERUBY = ruby
 TEST_RUNNABLE = yes
 !endif
 
-!if !defined(PROCESSOR_ARCHITECTURE)
+!if !defined(MACHINE)
-PROCESSOR_ARCHITECTURE = x86
+MACHINE = x86
 !endif
-MACHINE = $(PROCESSOR_ARCHITECTURE)
+!if "$(MACHINE)" == "x86"
-!if "$(PROCESSOR_ARCHITECTURE)" == "x86"
 !if !defined(PROCESSOR_LEVEL)
 PROCESSOR_LEVEL = 5
 !endif
@@ -103,8 +102,8 @@ PROCESSOR_FLAG = -G$(PROCESSOR_LEVEL)
 CPU = i$(PROCESSOR_LEVEL)86
 ARCH = i386
 !else
-CPU = $(PROCESSOR_ARCHITECTURE)
+CPU = $(MACHINE)
-ARCH = $(PROCESSOR_ARCHITECTURE)
+ARCH = $(MACHINE)
 !endif
 !if !defined(DEBUGFLAGS)
 DEBUGFLAGS = -Zi

win32/setup.mak

@@ -19,7 +19,6 @@ MAKE = $(MAKE) -f $(MAKEFILE)
 !else
 MAKEFILE = Makefile
 !endif
-ARCH = PROCESSOR_ARCHITECTURE
 CPU = PROCESSOR_LEVEL
 CC = cl -nologo
 CPP = $(CC) -EP
@@ -146,42 +145,28 @@ RUBY_SO_NAME = $(RUBY_SO_NAME)
 <<
 
 -generic-: nul
-!if defined($(ARCH)) || defined($(CPU))
+	@$(CPP) <<conftest.c 2>nul | findstr = >>$(MAKEFILE)
-	@type << >>$(MAKEFILE)
+#if defined _M_X64
-!if defined($(ARCH))
+MACHINE = x64
-!if "$(PROCESSOR_ARCHITECTURE)" == "AMD64"
+#elif defined _M_IA64
-$(ARCH) = x64
+MACHINE = ia64
-!elseif "$(PROCESSOR_ARCHITECTURE)" == "IA64"
+#else
-$(ARCH) = ia64
+MACHINE = x86
-!elseif defined(PROCESSOR_ARCHITEW6432)
+#endif
-$(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
-!endif
-!if defined($(CPU))
-$(CPU) = $(PROCESSOR_LEVEL)
-!endif
-
 <<
+!if defined($(CPU))
+	@$(APPEND) $(CPU) = $(PROCESSOR_LEVEL)
 !endif
+	@$(APPEND)
 
 -alpha-: nul
-	@echo $(ARCH) = alpha>>$(MAKEFILE)
+	@echo MACHINE = alpha>>$(MAKEFILE)
 -x64-: nul
-	@echo $(ARCH) = x64>>$(MAKEFILE)
+	@echo MACHINE = x64>>$(MAKEFILE)
 -ia64-: nul
-	@echo $(ARCH) = ia64>>$(MAKEFILE)
+	@echo MACHINE = ia64>>$(MAKEFILE)
 -ix86-: nul
-	@echo $(ARCH) = x86>>$(MAKEFILE)
+	@echo MACHINE = x86>>$(MAKEFILE)
 
 -i386-: -ix86-
 	@echo $(CPU) = 3>>$(MAKEFILE)