50 AC_MSG_ERROR([Could not find any builddeps.conf at all!]) |
50 AC_MSG_ERROR([Could not find any builddeps.conf at all!]) |
51 fi |
51 fi |
52 fi |
52 fi |
53 # Create build and target names that use _ instead of "-" and ".". |
53 # Create build and target names that use _ instead of "-" and ".". |
54 # This is necessary to use them in variable names. |
54 # This is necessary to use them in variable names. |
55 build_var=`echo ${OPENJDK_BUILD_SYSTEM} | tr '-' '_' | tr '.' '_'` |
55 build_var=`echo ${OPENJDK_BUILD_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` |
56 target_var=`echo ${OPENJDK_TARGET_SYSTEM} | tr '-' '_' | tr '.' '_'` |
56 target_var=`echo ${OPENJDK_TARGET_AUTOCONF_NAME} | tr '-' '_' | tr '.' '_'` |
57 # Extract rewrite information for build and target |
57 # Extract rewrite information for build and target |
58 eval rewritten_build=\${REWRITE_${build_var}} |
58 eval rewritten_build=\${REWRITE_${build_var}} |
59 if test "x$rewritten_build" = x; then |
59 if test "x$rewritten_build" = x; then |
60 rewritten_build=${OPENJDK_BUILD_SYSTEM} |
60 rewritten_build=${OPENJDK_BUILD_AUTOCONF_NAME} |
61 echo Build stays the same $rewritten_build |
61 echo Build stays the same $rewritten_build |
62 else |
62 else |
63 echo Rewriting build for builddeps into $rewritten_build |
63 echo Rewriting build for builddeps into $rewritten_build |
64 fi |
64 fi |
65 eval rewritten_target=\${REWRITE_${target_var}} |
65 eval rewritten_target=\${REWRITE_${target_var}} |
66 if test "x$rewritten_target" = x; then |
66 if test "x$rewritten_target" = x; then |
67 rewritten_target=${OPENJDK_TARGET_SYSTEM} |
67 rewritten_target=${OPENJDK_TARGET_AUTOCONF_NAME} |
68 echo Target stays the same $rewritten_target |
68 echo Target stays the same $rewritten_target |
69 else |
69 else |
70 echo Rewriting target for builddeps into $rewritten_target |
70 echo Rewriting target for builddeps into $rewritten_target |
71 fi |
71 fi |
72 rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'` |
72 rewritten_build_var=`echo ${rewritten_build} | tr '-' '_' | tr '.' '_'` |