changeset 1186:a844a4b6f097

Merge
author amurillo
date Thu, 03 Jul 2014 13:22:08 -0700
parents 326cc39c5ac4 c8d2966312d8
children 218351298ca9
files
diffstat 1 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/common/autoconf/hotspot-spec.gmk.in	Tue Jul 01 14:26:31 2014 -0700
+++ b/common/autoconf/hotspot-spec.gmk.in	Thu Jul 03 13:22:08 2014 -0700
@@ -69,8 +69,8 @@
 # Yet another name for arch used for an extra subdir below the jvm lib.
 # Uses i386 and amd64, instead of x86 and x86_64.
 LIBARCH=$(OPENJDK_TARGET_CPU_LEGACY_LIB)
-# Old name for OPENJDK_TARGET_CPU, uses i586 and amd64, instead of x86 and x86_64.
-ARCH=$(OPENJDK_TARGET_CPU_LEGACY)
+# Set the cpu architecture
+ARCH=$(OPENJDK_TARGET_CPU_ARCH)
 # Legacy setting for building for a 64 bit machine.
 # If yes then this expands to _LP64:=1
 @LP64@