Mercurial > hg > release > icedtea7-forest-2.2 > corba
changeset 420:10579933ba86
7130404: [macosx] "os.arch" value should be "x86_64" for compatibility with Apple JDK6
Summary: On Mac OS X, align system property "os.arch" with Apple legacy JDKs. Also, improve os.name string matching by using .contains() method instead of .startsWith(). This fix spans multiple repositories.
Reviewed-by: dcubed, phh, ohair, katleman
author | jmelvin |
---|---|
date | Wed, 04 Apr 2012 10:37:41 -0400 |
parents | 8bdf527067ac |
children | 81a59f2d7ea4 |
files | make/common/shared/Platform.gmk |
diffstat | 1 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Platform.gmk Thu Mar 29 15:42:11 2012 -0700 +++ b/make/common/shared/Platform.gmk Wed Apr 04 10:37:41 2012 -0400 @@ -1,5 +1,5 @@ # -# Copyright (c) 1997, 2010, Oracle and/or its affiliates. All rights reserved. +# Copyright (c) 1997, 2012, Oracle and/or its affiliates. All rights reserved. # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. # # This code is free software; you can redistribute it and/or modify it @@ -275,7 +275,7 @@ echo sparc \ ;; \ x86_64) \ - echo amd64 \ + echo x86_64 \ ;; \ "Power Macintosh") \ echo ppc \ @@ -287,12 +287,13 @@ ARCH := $(shell $(archExpr) ) ARCH_FAMILY := $(ARCH) - # Darwin x86 builds are i386/amd64 universal. - ifeq ($(SYSTEM_UNAME), Darwin) - ifneq ($(ARCH), ppc) - ARCH=universal - endif - endif + # Darwin builds are currently universal but only include 64-bit + # + # ifeq ($(SYSTEM_UNAME), Darwin) + # ifneq ($(ARCH), ppc) + # ARCH=universal + # endif + # endif # i586, sparc, and ppc are 32 bit, amd64 and sparc64 are 64 ifneq (,$(findstring $(ARCH), i586 sparc ppc universal))