diff options
| author | ohair <none@none> | 2009-05-08 16:42:11 -0700 |
|---|---|---|
| committer | ohair <none@none> | 2009-05-08 16:42:11 -0700 |
| commit | 0838e87720b24473c7207ac402123685d8dbd1ce (patch) | |
| tree | 0744c4b9c9306f7e4aa70a478ca879f4005cfb2a | |
| parent | b417f362bf261d2e1d73f0c8deb052685cd99c2b (diff) | |
| parent | be58dded939af668b3ff250a45f6737c44872a9a (diff) | |
Merge
| -rw-r--r-- | make/common/shared/Platform.gmk | 21 |
1 files changed, 17 insertions, 4 deletions
diff --git a/make/common/shared/Platform.gmk b/make/common/shared/Platform.gmk index 0886b15..428ff67 100644 --- a/make/common/shared/Platform.gmk +++ b/make/common/shared/Platform.gmk @@ -288,11 +288,22 @@ ifeq ($(PLATFORM), windows) TEMP_DISK=C:/temp # GNU Make or MKS overrides $(PROCESSOR_ARCHITECTURE) to always # return "x86". Use the first word of $(PROCESSOR_IDENTIFIER) instead. + PROC_ARCH:=$(word 1, $(PROCESSOR_IDENTIFIER)) + PROC_ARCH:=$(subst x86,X86,$(PROC_ARCH)) + PROC_ARCH:=$(subst x64,X64,$(PROC_ARCH)) + PROC_ARCH:=$(subst intel64,X64,$(PROC_ARCH)) + PROC_ARCH:=$(subst Intel64,X64,$(PROC_ARCH)) + PROC_ARCH:=$(subst INTEL64,X64,$(PROC_ARCH)) + PROC_ARCH:=$(subst em64t,X64,$(PROC_ARCH)) + PROC_ARCH:=$(subst EM64T,X64,$(PROC_ARCH)) + PROC_ARCH:=$(subst amd64,X64,$(PROC_ARCH)) + PROC_ARCH:=$(subst AMD64,X64,$(PROC_ARCH)) + PROC_ARCH:=$(subst ia64,IA64,$(PROC_ARCH)) ifndef ARCH_DATA_MODEL - ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),ia64) + ifeq ($(PROC_ARCH),IA64) ARCH_DATA_MODEL=64 else - ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)),AMD64) + ifeq ($(PROC_ARCH),X64) ARCH_DATA_MODEL=64 else ARCH_DATA_MODEL=32 @@ -313,10 +324,12 @@ ifeq ($(PLATFORM), windows) # + set ARCH to ia64 or amd64, or REQUIRED_WINDOWS_NAME=Windows Server 2003 REQUIRED_WINDOWS_VERSION=5 2 Service Pack 1 - ifeq ($(word 1, $(PROCESSOR_IDENTIFIER)), AMD64) + ifeq ($(PROC_ARCH),X64) ARCH=amd64 else - ARCH=ia64 + ifeq ($(PROC_ARCH),IA64) + ARCH=ia64 + endif endif LIBARCH=$(ARCH) # Value of Java os.arch property |