diff options
| author | mikejwre <none@none> | 2010-06-16 15:48:57 -0700 |
|---|---|---|
| committer | mikejwre <none@none> | 2010-06-16 15:48:57 -0700 |
| commit | e29dcd2e11ea20000576f965e87de2e6c4f05d5b (patch) | |
| tree | d40e7853207bf77065cc8492762d548268173639 | |
| parent | c05c6016e56d39084158dcc00d2c9bff463dcf0c (diff) | |
| parent | 0c8f05d5af0a53a9be731d82cc4db435901e7c25 (diff) | |
Mergejdk7-b98
| -rw-r--r-- | make/windows/makefiles/defs.make | 14 |
1 files changed, 13 insertions, 1 deletions
diff --git a/make/windows/makefiles/defs.make b/make/windows/makefiles/defs.make index 7bb84ea2f..851fe4f48 100644 --- a/make/windows/makefiles/defs.make +++ b/make/windows/makefiles/defs.make @@ -69,8 +69,20 @@ ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) AMD64),) 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 |