equal
deleted
inserted
replaced
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 |