Merge
authoramurillo
Tue, 08 Jul 2014 12:38:44 -0700
changeset 25322 1781c1f3734e
parent 25317 fa3876203ca9 (current diff)
parent 25321 3ced629c82b7 (diff)
child 25323 740e05fd7953
Merge
--- a/common/autoconf/hotspot-spec.gmk.in	Tue Jul 08 11:21:43 2014 -0700
+++ b/common/autoconf/hotspot-spec.gmk.in	Tue Jul 08 12:38:44 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@