Mercurial > hg > truffle
changeset 1558:8a045b3f5c13 jdk7-b98
Merge
author | mikejwre |
---|---|
date | Wed, 16 Jun 2010 15:48:57 -0700 |
parents | b0e7cd862748 (current diff) 70191885f707 (diff) |
children | 695c43156a9a |
files | |
diffstat | 1 files changed, 13 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/make/windows/makefiles/defs.make Thu Jun 10 13:58:59 2010 -0700 +++ b/make/windows/makefiles/defs.make Wed Jun 16 15:48:57 2010 -0700 @@ -69,8 +69,20 @@ MAKE_ARGS += Platform_arch_model=x86_64 endif +ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),) + ARCH_DATA_MODEL=64 + PLATFORM=windows-amd64 + VM_PLATFORM=windows_amd64 + HS_ARCH=x86 + MAKE_ARGS += LP64=1 + MAKE_ARGS += ARCH=x86 + MAKE_ARGS += BUILDARCH=amd64 + MAKE_ARGS += Platform_arch=x86 + MAKE_ARGS += Platform_arch_model=x86_64 +endif + # NB later OS versions than 2003 may report "Intel64" -ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) "EM64T\|Intel64"),) +ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),) ARCH_DATA_MODEL=64 PLATFORM=windows-amd64 VM_PLATFORM=windows_amd64