Mercurial > hg > truffle

comparison make/windows/makefiles/defs.make @ 1557:70191885f707

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6961079: Build JDK7 for 64 bit Windows using free Windows 7.1 SDK 64 bit compilers Reviewed-by: ohair, jcoomes
author prr
date Wed, 16 Jun 2010 09:42:20 -0700
parents c18cbe5936b8
children e13a5c0ed5e2
comparison
equal deleted inserted replaced
1555:5f42499e57ad 1557:70191885f707
67 MAKE_ARGS += BUILDARCH=amd64 67 MAKE_ARGS += BUILDARCH=amd64
68 MAKE_ARGS += Platform_arch=x86 68 MAKE_ARGS += Platform_arch=x86
69 MAKE_ARGS += Platform_arch_model=x86_64 69 MAKE_ARGS += Platform_arch_model=x86_64
70 endif 70 endif
71 71
72 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) EM64T),)
73 ARCH_DATA_MODEL=64
74 PLATFORM=windows-amd64
75 VM_PLATFORM=windows_amd64
76 HS_ARCH=x86
77 MAKE_ARGS += LP64=1
78 MAKE_ARGS += ARCH=x86
79 MAKE_ARGS += BUILDARCH=amd64
80 MAKE_ARGS += Platform_arch=x86
81 MAKE_ARGS += Platform_arch_model=x86_64
82 endif
83
72 # NB later OS versions than 2003 may report "Intel64" 84 # NB later OS versions than 2003 may report "Intel64"
73 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) "EM64T\|Intel64"),) 85 ifneq ($(shell $(ECHO) $(PROCESSOR_IDENTIFIER) | $(GREP) Intel64),)
74 ARCH_DATA_MODEL=64 86 ARCH_DATA_MODEL=64
75 PLATFORM=windows-amd64 87 PLATFORM=windows-amd64
76 VM_PLATFORM=windows_amd64 88 VM_PLATFORM=windows_amd64
77 HS_ARCH=x86 89 HS_ARCH=x86
78 MAKE_ARGS += LP64=1 90 MAKE_ARGS += LP64=1