1.1 --- a/common/autoconf/builddeps.m4 Thu Sep 06 17:27:20 2012 -0700
1.2 +++ b/common/autoconf/builddeps.m4 Tue Sep 18 11:29:16 2012 -0700
1.3 @@ -52,19 +52,19 @@
1.4 fi
1.5 # Create build and target names that use _ instead of "-" and ".".
1.6 # This is necessary to use them in variable names.
1.7 - build_var=`echo ${OPENJDK_BUILD_SYSTEM} | tr '-' '_' | tr '.' '_'`
1.8 - target_var=`echo ${OPENJDK_TARGET_SYSTEM} | tr '-' '_' | tr '.' '_'`
1.9 + build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
1.10 + target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'`
1.11 # Extract rewrite information for build and target
1.12 eval rewritten_build=\${REWRITE_${build_var}}
1.13 if test "x$rewritten_build" = x; then
1.14 - rewritten_build=${OPENJDK_BUILD_SYSTEM}
1.15 + rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME}
1.16 echo Build stays the same $rewritten_build
1.17 else
1.18 echo Rewriting build for builddeps into $rewritten_build
1.19 fi
1.20 eval rewritten_target=\${REWRITE_${target_var}}
1.21 if test "x$rewritten_target" = x; then
1.22 - rewritten_target=${OPENJDK_TARGET_SYSTEM}
1.23 + rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME}
1.24 echo Target stays the same $rewritten_target
1.25 else
1.26 echo Rewriting target for builddeps into $rewritten_target
