# HG changeset patch
# User lana
# Date 1333987104 25200
# Node ID 81a59f2d7ea4e7a880041eaa4fa4e9d2518ed35b
# Parent  c844df9ea59f4501f07e0e06cbe90f7ad5602ecc# Parent  10579933ba86103362ce82ee447dcfc04e6c6f70
Merge

diff -r c844df9ea59f -r 81a59f2d7ea4 make/common/shared/Platform.gmk
--- 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))