236 # platform. We can't use the AC_PROG_CC macro, since it can only be used |
236 # platform. We can't use the AC_PROG_CC macro, since it can only be used |
237 # once. Also, we need to do this before adding a tools dir to the path, |
237 # once. Also, we need to do this before adding a tools dir to the path, |
238 # otherwise we might pick up cross-compilers which don't use standard naming. |
238 # otherwise we might pick up cross-compilers which don't use standard naming. |
239 # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have |
239 # Otherwise, we'll set the BUILD_tools to the native tools, but that'll have |
240 # to wait until they are properly discovered. |
240 # to wait until they are properly discovered. |
241 AC_PATH_PROGS(BUILD_CC, [cl cc gcc]) |
241 BASIC_PATH_PROGS(BUILD_CC, [cl cc gcc]) |
242 BASIC_FIXUP_EXECUTABLE(BUILD_CC) |
242 BASIC_FIXUP_EXECUTABLE(BUILD_CC) |
243 AC_PATH_PROGS(BUILD_CXX, [cl CC g++]) |
243 BASIC_PATH_PROGS(BUILD_CXX, [cl CC g++]) |
244 BASIC_FIXUP_EXECUTABLE(BUILD_CXX) |
244 BASIC_FIXUP_EXECUTABLE(BUILD_CXX) |
245 AC_PATH_PROG(BUILD_LD, ld) |
245 BASIC_PATH_PROGS(BUILD_LD, ld) |
246 BASIC_FIXUP_EXECUTABLE(BUILD_LD) |
246 BASIC_FIXUP_EXECUTABLE(BUILD_LD) |
247 fi |
247 fi |
248 AC_SUBST(BUILD_CC) |
248 AC_SUBST(BUILD_CC) |
249 AC_SUBST(BUILD_CXX) |
249 AC_SUBST(BUILD_CXX) |
250 AC_SUBST(BUILD_LD) |
250 AC_SUBST(BUILD_LD) |
478 PATH="${TOOLS_DIR}:/usr/ccs/bin:${OLD_PATH}" |
478 PATH="${TOOLS_DIR}:/usr/ccs/bin:${OLD_PATH}" |
479 fi |
479 fi |
480 |
480 |
481 # Find the right assembler. |
481 # Find the right assembler. |
482 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
482 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
483 AC_PATH_PROG(AS, as) |
483 BASIC_PATH_PROGS(AS, as) |
484 BASIC_FIXUP_EXECUTABLE(AS) |
484 BASIC_FIXUP_EXECUTABLE(AS) |
485 else |
485 else |
486 AS="$CC -c" |
486 AS="$CC -c" |
487 fi |
487 fi |
488 AC_SUBST(AS) |
488 AC_SUBST(AS) |
489 |
489 |
490 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
490 if test "x$OPENJDK_TARGET_OS" = xsolaris; then |
491 AC_PATH_PROG(NM, nm) |
491 BASIC_PATH_PROGS(NM, nm) |
492 BASIC_FIXUP_EXECUTABLE(NM) |
492 BASIC_FIXUP_EXECUTABLE(NM) |
493 AC_PATH_PROG(GNM, gnm) |
493 BASIC_PATH_PROGS(GNM, gnm) |
494 BASIC_FIXUP_EXECUTABLE(GNM) |
494 BASIC_FIXUP_EXECUTABLE(GNM) |
495 AC_PATH_PROG(STRIP, strip) |
495 BASIC_PATH_PROGS(STRIP, strip) |
496 BASIC_FIXUP_EXECUTABLE(STRIP) |
496 BASIC_FIXUP_EXECUTABLE(STRIP) |
497 AC_PATH_PROG(MCS, mcs) |
497 BASIC_PATH_PROGS(MCS, mcs) |
498 BASIC_FIXUP_EXECUTABLE(MCS) |
498 BASIC_FIXUP_EXECUTABLE(MCS) |
499 elif test "x$OPENJDK_TARGET_OS" != xwindows; then |
499 elif test "x$OPENJDK_TARGET_OS" != xwindows; then |
500 AC_CHECK_TOOL(NM, nm) |
500 BASIC_CHECK_TOOLS(NM, nm) |
501 BASIC_FIXUP_EXECUTABLE(NM) |
501 BASIC_FIXUP_EXECUTABLE(NM) |
502 GNM="$NM" |
502 GNM="$NM" |
503 AC_SUBST(GNM) |
503 AC_SUBST(GNM) |
504 AC_CHECK_TOOL(STRIP, strip) |
504 BASIC_CHECK_TOOLS(STRIP, strip) |
505 BASIC_FIXUP_EXECUTABLE(STRIP) |
505 BASIC_FIXUP_EXECUTABLE(STRIP) |
506 fi |
506 fi |
507 |
507 |
508 # objcopy is used for moving debug symbols to separate files when |
508 # objcopy is used for moving debug symbols to separate files when |
509 # full debug symbols are enabled. |
509 # full debug symbols are enabled. |
510 if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then |
510 if test "x$OPENJDK_TARGET_OS" = xsolaris || test "x$OPENJDK_TARGET_OS" = xlinux; then |
511 AC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy]) |
511 BASIC_CHECK_TOOLS(OBJCOPY, [gobjcopy objcopy]) |
512 # Only call fixup if objcopy was found. |
512 # Only call fixup if objcopy was found. |
513 if test -n "$OBJCOPY"; then |
513 if test -n "$OBJCOPY"; then |
514 BASIC_FIXUP_EXECUTABLE(OBJCOPY) |
514 BASIC_FIXUP_EXECUTABLE(OBJCOPY) |
515 fi |
515 fi |
516 fi |
516 fi |
517 |
517 |
518 AC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump]) |
518 BASIC_CHECK_TOOLS(OBJDUMP, [gobjdump objdump]) |
519 if test "x$OBJDUMP" != x; then |
519 if test "x$OBJDUMP" != x; then |
520 # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing. |
520 # Only used for compare.sh; we can live without it. BASIC_FIXUP_EXECUTABLE bails if argument is missing. |
521 BASIC_FIXUP_EXECUTABLE(OBJDUMP) |
521 BASIC_FIXUP_EXECUTABLE(OBJDUMP) |
522 fi |
522 fi |
523 |
523 |
524 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then |
524 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then |
525 AC_PATH_PROG(LIPO, lipo) |
525 BASIC_PATH_PROGS(LIPO, lipo) |
526 BASIC_FIXUP_EXECUTABLE(LIPO) |
526 BASIC_FIXUP_EXECUTABLE(LIPO) |
527 fi |
527 fi |
528 |
528 |
529 TOOLCHAIN_SETUP_JTREG |
529 TOOLCHAIN_SETUP_JTREG |
530 |
530 |