Mercurial > hg > icedtea7-forest-aarch64 > corba
changeset 431:81a59f2d7ea4 jdk7u4-b20
Merge
author | lana |
---|---|
date | Mon, 09 Apr 2012 08:58:24 -0700 |
parents | c844df9ea59f (current diff) 10579933ba86 (diff) |
children | 91cf6d5b184c |
files | |
diffstat | 1 files changed, 9 insertions(+), 8 deletions(-) [+] |
line wrap: on
line diff
--- a/make/common/shared/Platform.gmk Thu Apr 05 15:09:46 2012 -0700 +++ b/make/common/shared/Platform.gmk Mon Apr 09 08:58:24 2012 -0700 @@ -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))