diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-31 08:07:50 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2014-10-31 08:07:50 +0000 |
| commit | 74ec76990ac05b706d0db2e658a4aa55b5f2165c (patch) | |
| tree | 95248b3a5e8a9f58545e55201abca8c1ed989277 /win32/Makefile.sub | |
| parent | 26c13db6e6cdf72fba137ce7455c4f34d9180472 (diff) | |
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
Diffstat (limited to 'win32/Makefile.sub')
| -rw-r--r-- | win32/Makefile.sub | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/win32/Makefile.sub b/win32/Makefile.sub index d2c1f8f5bb..c7cd2db699 100644 --- a/win32/Makefile.sub +++ b/win32/Makefile.sub @@ -86,11 +86,10 @@ BASERUBY = ruby TEST_RUNNABLE = yes !endif -!if !defined(PROCESSOR_ARCHITECTURE) -PROCESSOR_ARCHITECTURE = x86 +!if !defined(MACHINE) +MACHINE = x86 !endif -MACHINE = $(PROCESSOR_ARCHITECTURE) -!if "$(PROCESSOR_ARCHITECTURE)" == "x86" +!if "$(MACHINE)" == "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) -ARCH = $(PROCESSOR_ARCHITECTURE) +CPU = $(MACHINE) +ARCH = $(MACHINE) !endif !if !defined(DEBUGFLAGS) DEBUGFLAGS = -Zi |