diff options
| author | Jan Dubois <jand@activestate.com> | 2006-04-16 18:48:34 -0700 |
|---|---|---|
| committer | Steve Hay <SteveHay@planit.com> | 2006-04-18 15:17:52 +0000 |
| commit | bf2a35e5fa65d1d6e42daf3cc8bede2ee1fc847e (patch) | |
| tree | d2c45c7c1b54e3b5cff42f07a8c5fcf9c74bdb9e /win32 | |
| parent | b5c148cc3b91bc3840e72839fae74b068da25c4d (diff) | |
| download | perl-bf2a35e5fa65d1d6e42daf3cc8bede2ee1fc847e.tar.gz | |
win32/Makefile changes for Windows 64 bit
From: "Jan Dubois" <jand@ActiveState.com>
Message-ID: <036401c661fb$bc7a1200$2217a8c0@candy>
and make similar changes to win32/makefile.mk
and delete a spurious extra line from that file
p4raw-id: //depot/perl@27888
Diffstat (limited to 'win32')
| -rw-r--r-- | win32/Makefile | 20 | ||||
| -rw-r--r-- | win32/makefile.mk | 21 |
2 files changed, 24 insertions, 17 deletions
diff --git a/win32/Makefile b/win32/Makefile index 3257ed311b..a8dcdb9eeb 100644 --- a/win32/Makefile +++ b/win32/Makefile @@ -308,11 +308,14 @@ PROCESSOR_ARCHITECTURE = x86 !ENDIF !IF "$(WIN64)" == "" +# When we are running from a 32bit cmd.exe on AMD64 then +# PROCESSOR_ARCHITECTURE is set to x86 and PROCESSOR_ARCHITEW6432 +# is set to AMD64 !IF "$(PROCESSOR_ARCHITEW6432)" != "" PROCESSOR_ARCHITECTURE = $(PROCESSOR_ARCHITEW6432) WIN64 = define !ELSE -!IF "$(PROCESSOR_ARCHITECTURE)" == "IA64" +!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" || "$(PROCESSOR_ARCHITECTURE)" == "IA64" WIN64 = define !ELSE WIN64 = undef @@ -320,20 +323,21 @@ WIN64 = undef !ENDIF !ENDIF -!IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -PROCESSOR_ARCHITECTURE = x86_64 +ARCHITECTURE = $(PROCESSOR_ARCHITECTURE) +!IF "$(ARCHITECTURE)" == "AMD64" +ARCHITECTURE = x64 !ENDIF -!IF "$(PROCESSOR_ARCHITECTURE)" == "IA64" -PROCESSOR_ARCHITECTURE = ia64 +!IF "$(ARCHITECTURE)" == "IA64" +ARCHITECTURE = ia64 !ENDIF !IF "$(USE_MULTI)" == "define" -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi +ARCHNAME = MSWin32-$(ARCHITECTURE)-multi !ELSE !IF "$(USE_PERLIO)" == "define" -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-perlio +ARCHNAME = MSWin32-$(ARCHITECTURE)-perlio !ELSE -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE) +ARCHNAME = MSWin32-$(ARCHITECTURE) !ENDIF !ENDIF diff --git a/win32/makefile.mk b/win32/makefile.mk index f3604893fc..98779d4ec0 100644 --- a/win32/makefile.mk +++ b/win32/makefile.mk @@ -309,32 +309,35 @@ BUILDOPT += -DPERL_IMPLICIT_SYS PROCESSOR_ARCHITECTURE *= x86 .IF "$(WIN64)" == "" +# When we are running from a 32bit cmd.exe on AMD64 then +# PROCESSOR_ARCHITECTURE is set to x86 and PROCESSOR_ARCHITEW6432 +# is set to AMD64 .IF "$(PROCESSOR_ARCHITEW6432)" != "" PROCESSOR_ARCHITECTURE != $(PROCESSOR_ARCHITEW6432) WIN64 = define -.ELIF "$(PROCESSOR_ARCHITECTURE)" == "IA64" +.ELIF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" || "$(PROCESSOR_ARCHITECTURE)" == "IA64" WIN64 = define .ELSE WIN64 = undef .ENDIF .ENDIF -.IF "$(PROCESSOR_ARCHITECTURE)" == "AMD64" -PROCESSOR_ARCHITECTURE = x86_64 +ARCHITECTURE = $(PROCESSOR_ARCHITECTURE) +.IF "$(ARCHITECTURE)" == "AMD64" +ARCHITECTURE = x64 .ENDIF -.IF "$(PROCESSOR_ARCHITECTURE)" == "IA64" -PROCESSOR_ARCHITECTURE = ia64 +.IF "$(ARCHITECTURE)" == "IA64" +ARCHITECTURE = ia64 .ENDIF .IF "$(USE_MULTI)" == "define" -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-multi +ARCHNAME = MSWin32-$(ARCHITECTURE)-multi .ELSE .IF "$(USE_PERLIO)" == "define" -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE)-perlio +ARCHNAME = MSWin32-$(ARCHITECTURE)-perlio .ELSE -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE) +ARCHNAME = MSWin32-$(ARCHITECTURE) .ENDIF -ARCHNAME = MSWin32-$(PROCESSOR_ARCHITECTURE) .ENDIF .IF "$(USE_ITHREADS)" == "define" |